Change to save a folder.
Merge branch 'master' of git://github.com/Emergya/persistence-geo into upstream
Merge branch 'master' of https://github.com/moiarcsan/persistence-geo

Conflicts:
	persistence-geo-rest/src/main/java/com/emergya/persistenceGeo/web/RestLayersAdminController.java
Changes to fix a merge problem.
Merge branch 'upstream'
Merge branch 'upstream'
Merge branch 'upstream'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Emergya/persistence-geo
Merge branch 'master' of https://github.com/Emergya/persistence-geo
[#73655] Subida de shape.
Merge pull request #35 from luisromangz/master

#76538 @ sir-ohiggins completed
[#73655] Subida de shape.
[#73655] Subida de shape

Creación de datastores Postgis JNDI.
Merge branch '73655-subida-shape' of github.com:juanluisrp/persistence-geo into 73655-subida-shape
[#73655] Subida de shape

Nombre de capa.
Merge branch 'master' of https://github.com/Emergya/persistence-geo
Merge pull request #36 from juanluisrp/73655-subida-shape

[#73655] subida shape
[maven-release-plugin] prepare release 1.7
[maven-release-plugin] prepare for next development iteration