merged v7.1 to master and solved merge conflicts

.gitignore

CODE_OF_CONDUCT.md

Documentation/html/.buildinfo

Documentation/html/.nojekyll

Documentation/html/Developers/gen_docu.html

...entation/html/Documentation/Api/Fortran/css/bootstrap.css

...tion/html/Documentation/Api/Fortran/css/bootstrap.min.css

...ation/html/Documentation/Api/Fortran/css/font-awesome.css

...n/html/Documentation/Api/Fortran/css/font-awesome.min.css

Documentation/html/Documentation/Api/Fortran/css/local.css

...mentation/html/Documentation/Api/Fortran/css/pygments.css

Documentation/html/Documentation/Api/Fortran/favicon.png

...l/Documentation/Api/Fortran/fonts/fontawesome-webfont.eot

...l/Documentation/Api/Fortran/fonts/fontawesome-webfont.svg

...l/Documentation/Api/Fortran/fonts/fontawesome-webfont.ttf

.../Documentation/Api/Fortran/fonts/fontawesome-webfont.woff

...tation/Api/Fortran/fonts/glyphicons-halflings-regular.eot

...tation/Api/Fortran/fonts/glyphicons-halflings-regular.svg

...tation/Api/Fortran/fonts/glyphicons-halflings-regular.ttf

...ation/Api/Fortran/fonts/glyphicons-halflings-regular.woff