dfdfd

eee
Merge branch 'master' of https://github.com/wangyuanmingda/Shanghai-Innovation-Project

Conflicts:
	bin/MyAppDeMo.apk
	bin/classes.dex
	bin/jarlist.cache
	bin/resources.ap_