Merge origin/master

Conflicts:
	Pierre/HouseCard/create_hc_modele.php
	modele/add_house.php
	modele/search_ad.php
	modele/search_profile_reminder.php
	view/create_house.php
	view/css/hsh_style.css
	view/my_profile.php
	view/profile_reminder.php
Merge origin/master

Conflicts:
	controler/content.php
Merge origin/master

Conflicts:
	controler/content.php
Merge origin/master