add 4 brances
change the picmatch scene to farmgame
add bg layer
move the background
control the background range
add the BuildingsLayer
update
update the TouchListener
update
update many things
update the AddBuildingLayer
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