[cppengine] fixed reference error;
[cppengine] fixed typo;
Merge branch 'experimental' into feature/gcc4.7-support

Conflicts:
	CPPEngine/src/headers/engine/Engine.h