Merge branch 'master' into branch1
test
TIleMap coord
tile map
Merge branch 'branch1'

Conflicts:
	Classes/GameLayer/GamePlayLayer.cpp
	Classes/GameLayer/GamePlayLayer.h
	Classes/Unit/LivingUnit.cpp

proj.ios_mac/HelloWorld3.2.xcodeproj/project.xcworkspace/xcuserdata/mali
ang.xcuserdatad/UserInterfaceState.xcuserstate