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

Conflicts:
	application/views/concert/success-concert.php
	application/views/photos/delete_photos.php