Signed-off-by: thamararangana <mpnew2@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/phgis.git

Conflicts:
	src/conf/persistence.xml

Signed-off-by: thamararangana <mpnew2@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/phgis.git

Conflicts:
	src/conf/persistence.xml