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

Conflicts:
	docroot/html/people-trained/view.jsp