Update general et modification de toute l'architecture vues
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	assets/css/slyset.css