修改服务条款
添加测试地址
修改gps定时任务
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