Merge branch '8.1-ohiggins-SNAPSHOT' of github.com:Emergya/persistence-geo into 8.1-ohiggins-SNAPSHOT

Conflicts:
	persistence-geo-core/src/main/java/com/emergya/persistenceGeo/dao/impl/ZoneEntityDaoHibernateImpl.java
	persistence-geo-core/src/main/java/com/emergya/persistenceGeo/service/ZoneAdminService.java
Merge branch '8.1-ohiggins-SNAPSHOT' of github.com:luisromangz/persistence-geo into luisromangz-8.1-ohiggins-SNAPSHOT

Conflicts:
	persistence-geo-core/src/main/java/com/emergya/persistenceGeo/service/ZoneAdminService.java