update
Merge branch 'master' of https://github.com/chouqiu/weizhang

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml