ajout album
Merge origin/master

Conflicts:
	controller/DashboardController.php
	index.php