Merge branch 'master' of G:\Workspace\Android\aha\CutHead with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/cuthead/app/NBProgressBarFragment.java
	app/src/main/java/com/cuthead/app/QBProgressWheelFragment.java
	app/src/main/java/com/cuthead/app/SubmitFragment.java
normal 改进