fix bug
Merge branch 'master' of https://github.com/zhiying8710/app_im

Conflicts:
	src/com/sf/heros/im/req/controller/LoginController.java
fix bug