normal 改进
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/cuthead/app/SubmitFragment.java
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-mdpi/ic_launcher.png
	app/src/main/res/drawable-xhdpi/ic_launcher.png
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	app/src/main/res/values/styles.xml
normal 改进