admin panel
Merge branch 'master' of https://github.com/leyven/Cuatrimestre-7

Conflicts:
	app/routes.php