Merge origin/master

Conflicts:
	forum/messagelistupdate.php
Merge origin/master

Conflicts:
	view/css/mailbox_style.css
	view/my_houses.php
Merge origin/master

Conflicts:
	view/css/mailbox_style.css