Cambios de Esteban G
Merge branch 'master' of https://github.com/egamboa/simceg-proto

Conflicts:
	simceg/grails-app/controllers/org/una/simceg/HomeController.groovy