minor stuff
minor stuff on brutus
minor conflict resolving on brutus
minor stuff on reynolds
minor conflict resolving on reynolds
Merge branch 'github' of scratch-petros.ethz.ch:/export/home/gitroot/CUBISM-MPCF into fabian