Merge branch 'master' into Weblogic

Conflicts:
	build.gradle
	lib/SelloDigital.jar
	sql/catalogos_inegi_data.sql
	src/main/java/mx/gob/renapo/registrocivil/actos/adopcion/service/impl/AdopcionServiceImpl.java
	src/main/java/mx/gob/renapo/registrocivil/actos/defuncion/dao/impl/DefuncionDAOImpl.java
	src/main/java/mx/gob/renapo/registrocivil/comun/dao/impl/TriggerDAOImpl.java
	src/main/webapp/WEB-INF/libs/PrintApplet.jar
	src/main/webapp/WEB-INF/libs/SelloDigital.jar
	src/main/webapp/WEB-INF/spring-config/applicationContext-security.xml