GenerarFormaciones (falta ventana)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/opf5.css