add adduser
Merge branch 'master' of github.com:rigeljs/ConversifyBackend

Conflicts:
	chat.py
Merge branch 'master' of github.com:rigeljs/ConversifyBackend