no message
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop

Conflicts:
	src/modules/battle/stage/BattleDropStarLayer.as
no message
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop
no message
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop
no message