build mac runtime error
fixed runtime compile error
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	frameworks/cocos2d-x/cocos/scripting/lua-bindings/auto/lua_cocos2dx_custom.cpp
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
support findEnemy in testAIScene
support findEnemy in testAIScene
Merge pull request #5 from calfjohn/master

support findEnemy in testAIScene