minor
Merge branch 'master' of github.com:fab4100/CUBISM-JR-GPU-MPCF

Conflicts:
	test/MPI/Makefile