fix bug in user profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/tests.py
	db.sqlite3