Added GeoServer Support#42

aheyne wants to merge 6 commits intoccri:masterccri/cloud-local:masterfrom

aheyne:fcr_add_geoserver_supportaheyne/cloud-local:fcr_add_geoserver_supportCopy head branch name to clipboard