chg:
Merge branch 'master' of https://github.com/jiaben/lily

Conflicts:
	cocos2dx/projects/XiYouTa/Resources/script/Object/Soldier.lua