[homepage] reindent html
[homepage] add the content integration
[homepage] reident base plus externalize style
[homepage] change integration de la base
Merge branch 'master' into vivien/homepage_integration

Conflicts:
	static/css/homepage_new.css
	templates/base.html
	templates/homepage.html
Merge branch 'vivien/homepage_integration'