-Cambios phonegap
Merge branch 'master' of https://github.com/klanata/SSAC

Conflicts:
	Proyecto-Core/ejbModule/com/core/service/negocio/RescatistaEB.java