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

Conflicts:
	AQTools/aq/aq_tools.cpp
Merge branch 'master' of https://github.com/TMA-AQ/AlgoQuest
fix compilation errors under mac os