Enhancement 1195, clean-up excel roster formatting.
Enhancement 1188, fixed preferred trainer sorting.
Enhancement 1070, in user profile page show all user types.
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop3-portlet