修改gps监听，异常提示，拍照
合并
Merge branch 'master' of https://github.com/chxy020/runing into chenxy
Merge branch 'chenxy'
注销测试代码，准备提交
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