Started to add email and password management functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChatDashboard/chatapp/views.py