Echo luis:
Merge branch 'master' of https://github.com/omss14/GEA

Conflicts:
	app/Controller/PagesController.php