fixed some compile errors on osx
Merge branch 'master' of https://github.com/wangyanxing/Demi3D

Conflicts:
	src/games/Arena/ArenaNPCEntity.cpp