DB
Merge branch 'master' of
github.com:RaytheonWebSolutions/globe-gov-workshop2-portlet

Conflicts:
	docroot/WEB-INF/lib/globe-gov-workshop2-portlet-service.jar
DB commit