选择框修改，细节优化，发布审核
Merge branch 'master' of https://github.com/Ebingo/Ebingo

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/util/ContextUtil.java
	app/src/main/java/com/promote/ebingo/util/FileUtil.java
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/util/ContextUtil.java
	app/src/main/java/com/promote/ebingo/util/FileUtil.java
	app/src/main/res/values/strings.xml