Merge origin/master

Conflicts:
	view/create_house.php
	view/css/createhouse_style.css
	view/css/mailbox_style.css
Merge origin/master

Conflicts:
	view/confirm_add_user.php