test
Merge branch 'c860' into develop

Conflicts:
	Classes/GameScene.cpp
	Classes/StartScene.cpp
merge
merge
fix the getInstance
finish the resource layer
do half of the Girl Class
finish the girl animation
update
Merge remote-tracking branch 'origin/develop' into c860
增加了地图数组，优化了地图拖拽算法