chat+7
Merge branch 'develop' of github.com:maskerliu/lynx-argus into develop

Conflicts:
	argus-plugin-chat-alpha/src/com/lynx/argus/plugin/chat/LoginFragment.java