Fix cppcheck run
Merge pull request #118 from tribal-tec/master

Fix cppcheck run
cppcheck 1.63 fixes for RHEL6
Merge pull request #119 from tribal-tec/master

cppcheck 1.63 fixes for RHEL6
Fix barrier unit test
Cleanup: Move object command enum to its proper header
Merge pull request #120 from eile/master

Cleanup: Move object command enum to its proper header
Merge branch 'mpi' of https://github.com/carlosduelo/Collage

Conflicts:
	CMakeLists.txt
Partial CR #109
merge branch master of eyescale
Merge remote-tracking branch 'eile/mpi' into mpi
correct CMake/Collage.cmake