bug fixes and updates
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop2-portlet