15/08/2013
15/08/2013
15/08/2013
Merge branch 'master' of https://github.com/cantwait/psp.git

Conflicts:
	psp-integracion/.classpath
	psp-integracion/conf/localidad/mule-config.xml
	psp-integracion/conf/localidad/psp-dataservices-config-localidad.xml
	psp-integracion/conf/localidad/spring/spring-opc-base.xml
	psp-integracion/conf/mule-config.xml
	psp-integracion/conf/pais/mule-config.xml
	psp-integracion/conf/pais/psp-dataservices-config-pais.xml
	psp-integracion/conf/pais/spring/spring-opc-base.xml
	psp-integracion/conf/region/mule-config.xml
	psp-integracion/conf/region/psp-dataservices-config-region.xml
	psp-integracion/conf/region/spring/spring-opc-base.xml
	psp-services/src/com/pdvsa/psp/mule/component/MongoFindErrorComponent.java