bouton + finition + wall
Merge branch 'master' of https://github.com/Alexiscap/slyset

Conflicts:
	application/config/routes.php
	application/controllers/mc_followers.php
	application/controllers/mc_stats.php
	application/controllers/melo_achats.php
	application/views/concert/ajouter_concert.php
	application/views/concert/mc_concert_passe.php
	application/views/concert/mc_concerts.php
	application/views/concert/melo_concert_passe.php
	application/views/concert/melo_concerts.php
	application/views/concert/success-concert.php
	application/views/concert/suppression_concert.php
	application/views/follower/mc_followers.php
	application/views/follower/melomane.php
	application/views/follower/musicien.php
	application/views/musique/mc_musique.php
	application/views/partition/mc_partitions.php
	application/views/photos/album.php
	application/views/photos/mc_photos.php
	application/views/wall/mc_actus.php
	application/views/wall/melo_actu.php