增加了必要的提示
Merge branch 'master' of github.com:templefox/CulturePlatform

Conflicts:
	bin/CulturePlatform.apk
	bin/classes.dex