Merge origin/master

Conflicts:
	Pierre/HouseCard/create_hc_modele.php
Merge origin/master

Conflicts:
	Pierre/HouseCard/create_hc_modele.php
Merge origin/master

Conflicts:
	Pierre/HouseCard/create_hc_modele.php