Intégration mat 3
Merge branch 'master' of https://github.com/msalettes/houston

Conflicts:
	houston/assets/home.html
	houston/assets/js/home.js
mat 4
Merge branch 'master' of https://github.com/msalettes/houston

Conflicts:
	houston/assets/home.html