test
right
Merge branch 'master' of github.com:noonnightstorm/FarmGame
del pro.android
test
push an avaliable version
add the BuildingsLayer
add GameResource
resolve the conflict
update
update the TouchListener
update
update many things
update the AddBuildingLayer
Merge branch 'c860' into develop

Conflicts:
	Classes/GameScene.cpp
	Classes/StartScene.cpp
merge
merge