update for system
Merge branch 'master' of https://github.com/Ledda/MiaMiaProject

Conflicts:
	app/Controller/QuotesController.php