Merge branch 'develop'
Merge branch 'develop'
messageController json modified
prop exception
roleMapper.xml
roleService
messageController and friendController
messageController and friendController bugs
messageService commit
login session id not complete
multi client login problem
heartbeat controller
change jsonlib to jackson in loginserver
Merge branch 'master' into develop
feature of contraining operating too fast