1.05 改动
修改代码版本
惩罚条目
1.05 改动
惩罚条目
Merge branch 'dachun' into develop
Merge branch 'develop' of github.com:wanbin/Undercover into develop
Merge branch 'develop' of github.com:wanbin/Undercover into develop

Conflicts:
	res/values/strings.xml