pop in
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/views/concert/ajouter_concert.php
	application/views/concert/modifier_concert.php
	assets/css/slyset.css
Merge https://github.com/Alexiscap/slyset

Conflicts:
	application/config/routes.php
	application/controllers/melo_achats.php
	application/controllers/melo_concerts.php
	application/models/wallm.php
	application/views/achat/melo_achats.php
	application/views/concert/melo_concert_passe.php
	application/views/concert/melo_concerts.php
	application/views/follower/mc_followers.php
	application/views/follower/melo_abonnements.php
	application/views/photos/mc_photos.php
	application/views/wall/melo_actu.php
	assets/javascript/slyset.js