xcode commit...
Merge branch 'master' of https://github.com/vengine/XGC

Conflicts:
	common/include/xhn_garbage_collector.hpp
	common/src/xhn_garbage_collector.cpp