controller
Merge branch 'master' of https://github.com/jose1988/src

Conflicts:
	conf/xml-resources/web-service-references/GestionDepolitica/wsdl/localhost_15362/CapaDeServicios/GestionDepolitica.xsd_1.xsd