enhancement 973
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop3-portlet
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop3-portlet
enhancement 973 (Modify workshop trainer search to match other search
portets); minor fixes in Trainer Search (enhancement 972)