Cherry picked from Jacky's branch, resolved conflicts

Conflicts:
	main/models.py
	main/views/userViews.py