1.更新assets目录web文件
Revert "1.更新assets目录web文件"

This reverts commit 30d1f2e4033d4c722b18e5d3042a946fbf9d9308.
Merge branch 'master' into chenxy
1.修改分享布局
Merge branch 'master' into chenxy
1.更新了最新的web代码
2.修改了请求服务地址为endpoints1
1.删除多余js文件
Merge branch 'master' into chenxy

Conflicts:
	assets/web/setup_about.html
	gen/net/yaopao/activity/R.java
	src/net/yaopao/activity/MainActivity.java
	src/net/yaopao/activity/WebViewActivity.java
	src/net/yaopao/assist/Variables.java
1.添加登录保存比赛状态数据
2.添加24小时比赛按钮跳转逻辑
1.格式化sharesdk.xml
Merge branch 'master' into chenxy

Conflicts:
	gen/net/yaopao/activity/R.java
	src/net/yaopao/activity/SplashActivity.java
	src/net/yaopao/assist/Constants.java
Merge branch 'master' into chenxy
1.修改运动记录分享
1.修改运动记录分享,微信,微信朋友圈分享还是不可以
1.修改运动分享
1.修改分享title内容获取
1.修改运动记录分享跳转
Merge branch 'master' into chenxy
1.修改运动记录ID获取
1.修改登录崩溃bug
2.修改分享布局