Estado y condicion
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/resources/js/apps/cuadro_nominal/form/form_layout.js
Estado y condicion