Now the objectives are shown in the game!
Merge branch 'master' of https://github.com/larryPersonal/Nanhua

Conflicts:
	PopulationTest.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/larryPersonal/Nanhua
merged
Merge branch 'master' of https://github.com/larryPersonal/Nanhua

Conflicts:
	PopulationTest/DemoScene.tmx