Merge origin/master

Conflicts:
	view/create_house.php
Merge origin/master