理发师返回为空的异常处理等
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/cuthead/app/NBTimeFragment.java
	app/src/main/java/com/cuthead/app/SubmitFragment.java
理发师返回为空的异常处理等