Page 404
Pages statiques
Changements infinite scroll
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	application/config/routes.php
	application/controllers/admin_articles.php
	application/controllers/admin_melomanes.php
	application/controllers/admin_musiciens.php
	application/controllers/home.php
	application/controllers/pages_statiques.php
	application/controllers/search.php
	application/themes/slyset.php
	application/views/achat/melo_achats.php
	application/views/statiques/faq.php
	application/views/statiques/mentions_legales.php
	application/views/wall/melo_actu.php
	assets/css/tpl_sidebar-left.css
	assets/javascript/infinite_scroll.js