Merge branch 'master' of github.com:mantaraya36/AlloSystem

Conflicts:
	allocore/CMakeLists.txt
	cmake_modules/FindGamma.cmake