Merge origin/master

Conflicts:
	view/my_profile.php
Merge origin/master
Merge origin/master

Conflicts:
	view/my_profile.php
Merge origin/master

Conflicts:
	forum/messagelistupdate.php
Merge origin/master

Conflicts:
	forum/messagelistupdate.php