Merge branch 'developMartin' into developCudaStreams

CMake/cmake_config_files/MOLLOK.config.cmake

apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp

src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp

src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp

src/gpu/VirtualFluids_GPU/Parameter/Parameter.h