Merge remote-tracking branch 'origin/master'

Conflicts:
	user_profile/templates/profile.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_profile/templates/profile.html