修改消息 去重复
Merge remote-tracking branch 'origin/master'

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