Léger changement de slyset.css entre 2 commits camille-alexis
Merge branch 'master' of github.com:Alexiscap/slyset
Global update
Merge branch 'master' of github.com:Alexiscap/slyset

Conflicts:
	.htaccess
	application/config/routes.php
	application/controllers/home.php
	application/controllers/mc_concerts.php
	application/controllers/mc_partitions.php
	application/controllers/mc_photos.php
	application/controllers/melo_concerts.php
	application/controllers/pi_ta_paiement.php
	application/models/concert.php
	application/views/homepage.php
	application/views/sidebars/sidebar_left.php
	application/views/wall/melo_actu.php
	assets/javascript/slyset.js
	files/30/photos/alaune.png
	files/30/photos/avatar.png