处理消息问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/timetalent/client/service/impl/AppServiceImpl.java
	src/com/timetalent/client/ui/login/LoginActivity.java