Closes #268
Merge branch 'CNC1' into CNC2

Conflicts:
	src/main/webapp/WEB-INF/formularios/F1.2.xml