Commented out SHP for now
Merge branch 'master' of https://github.com/radiantbluetechnologies/omar
Merge branch 'master' of https://github.com/radiantbluetechnologies/omar

Conflicts:
	plugins/omar-ogc/grails-app/services/org/ossim/omar/ogc/WebFeatureService.groovy