Merge branch 'CNC1' into CNC2

Conflicts:
	src/main/webapp/WEB-INF/formularios/F1.2.xml
Merge branch 'CNC2' of github.com:/cuyum/FormRender into CNC2

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

 On branch CNC2
 Your branch and 'origin/CNC2' have diverged,
 and have 1 and 10 different commits each, respectively.
 All conflicts fixed but you are still merging.
 Changes to be committed:
	modified:   src/main/java/ar/com/cuyum/cnc/service/rest/RelayRest.java
	modified:   src/main/resources/META-INF/persistence.xml
	modified:   src/main/webapp/WEB-INF/formularios/F1.19.xml
	modified:   src/main/webapp/WEB-INF/formularios/F1.2.xml
	modified:   src/main/webapp/WEB-INF/formularios/F1.7.xml
	modified:   src/main/webapp/WEB-INF/formularios/ict4.2.4.4-A.xml
	new file:   src/main/webapp/resources/js/.gitignore
	modified:   src/main/webapp/resources/js/cncFieldValidations.js
	modified:   src/main/webapp/resources/js/cncGUI.js
	modified:   src/main/webapp/resources/js/jquery-ui.min.js
	modified:   src/main/webapp/schemas/ict4.2.2.1-A-schema.json
	modified:   src/main/webapp/schemas/ict4.2.4.4-A-schema.json
	modified:   src/main/webapp/schemas/ict4.2.4.5-A-schema.json
	modified:   src/test/java/schemagenerator/TestJsonSchemaGeneration.java
	modified:   src/test/resources/formularios/schemas/ict4.2.2.1-A-schema.json
	modified:   src/test/resources/formularios/schemas/ict4.2.4.4-A-schema.json
	modified:   src/test/resources/formularios/schemas/ict4.2.4.5-A-schema.json
	modified:   src/test/resources/formularios/xml/F1.18.xml
	modified:   src/test/resources/formularios/xml/F1.2.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.1.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.1.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.1.d.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.1.e.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.2.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.3.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.3.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.4.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.4.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.5.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.5.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.6.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.6.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.6.c.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.7.a.xml
	deleted:    src/test/resources/formularios/xml/ict4.1.7.b.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.1.xml
	modified:   src/test/resources/formularios/xml/ict4.2.2.1-a.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.2.1-ax.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.2.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.3.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.4.1.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.4.2.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.4.3.xml
	modified:   src/test/resources/formularios/xml/ict4.2.4.4-A.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.4.4.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.4.5.xml
	deleted:    src/test/resources/formularios/xml/ict4.2.5.xml