fix compilation error on mac
Merge branch 'master' of https://github.com/TMA-AQ/AlgoQuest

Conflicts:
	AQEngineTests/aq/FunctionalTests.cpp
	AQEngineTests/aq/Util.cpp
	AQManager/aq/AQManager.h