import user dao
Merge branch 'master' of https://github.com/rigeljs/ConversifyBackend

Conflicts:
	chat.py