备份向后合并之前的版本
no message
no message
Merge branch 'develop' of https://github.com/AllenShen/mobileDemo into develop

Conflicts:
	bin-debug/MobileNew.swf