sync data
Merge branch 'master' of https://github.com/szpaddy/phoneapp

Conflicts:
	.settings/org.eclipse.wst.common.component
	document/项目文档/需求文档/微信菜单.txt
	src/main/webapp/appframework.js
	src/main/webapp/login.jsp
	src/main/webapp/plugins/css/af.scroller.css