vista revisar
vista validar
Merge branch 'master' of https://github.com/jpverdejo/ingeso

Conflicts:
	config/database.yml