temp commit: merge with recent
Merge branch 'master' of https://github.com/jingdiren/secureim
added server db & username validation