Merge remote-tracking branch 'origin/master'

Conflicts:
	mental/views.py
updated user view