closed #225
Merge branch 'CNC2' of https://github.com/cuyum/FormRender into CNC2

Conflicts:
	src/main/webapp/resources/js/cncFieldValidations.js