Merge origin/master

Conflicts:
	view/my_profile.php