Merge origin/master

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

Conflicts:
	modele/search_my_houses.php