enhancement 1058, remove pending status col. from list_trainiers, make
trainer active by default.
- enhancement 1058, default trainer status to active, add link to make
inactive.
Merge branch 'trainer_search' of github.com:RaytheonWebSolutions/globe-gov-workshop3-portlet into trainer_search

Conflicts:
	README.txt
Update version number.
updates to trainer search.
enhancement 1058, default trainer status to active, add link to make
pending.
Merge branch 'master' into trainer_search

Conflicts:
	README.txt
Rebuilt.
Merge branch 'master' into trainer_search

Conflicts:
	README.txt
enhancement 978
remove testing code
enhancement 978
- b1490 (Modification to the People Trained Query)
- b1491 (Modification to the Schools with People Trained Query)
modified verbiage on people-trained/view.jsp and
schools-trained/view.jsp
e1067 (Change default filter to Organization's Workshop)
enhancement 978
enhancement 978
enhancement 978
updated module #
Merge branch 'master' into trainer_search

Conflicts:
	README.txt