For workshop search, use database function to determine sub
organization.
Merge branch 'master' of
github.com:RaytheonWebSolutions/globe-gov-workshop2-portlet

Conflicts:
	docroot/WEB-INF/lib/globe-gov-workshop2-portlet-service.jar
	docroot/WEB-INF/src/service.properties
Update workshop search custom sql.
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop2-portlet