Almost done. (p2)
Merge remote-tracking branch 'origin/v0.2.3' into v0.2.3

Conflicts:
	Classes/MainScene.cpp
	Classes/MapModel.cpp
	Classes/MapModel.h
	Resources/Normal/Unit/Character002.png
	Resources/Normal/Unit/Character003.png
	proj.win32/Parallelformosa_Cocos2dx.sdf
	proj.win32/Parallelformosa_Cocos2dx.v12.suo
Merge remote-tracking branch 'origin/v0.2.3' into v0.2.3

Conflicts:
	Classes/MainScene.cpp