#15 Update portal.properties to point to local geoserver
Merge branch 'master' of https://github.com/sibbr/sib-dataportal

Conflicts:
	portal-web/src/main/webapp/WEB-INF/classes/portal.properties
Merge branch 'master' of https://github.com/sibbr/sib-dataportal