GFE: template modificar formacion
Merge branch 'master' of https://github.com/Dannypool/SISEFIE

Conflicts:
	app/templates/GFE/nuevoAspirante.html