Add trainer search jsp file.
Initial commit for trainer_search branch, not functional.
Merge branch 'master' into trainer_search

Conflicts:
	README.txt
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.
Merge branch 'master' into trainer_search

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

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

Conflicts:
	README.txt
enhancement 972, add trainer search.
Merge branch 'master' into trainer_search

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

Conflicts:
	README.txt
enhancement 972, add trainer search; fixed protocol order issue in
Member Training Records screen; fixed "schools with people trained
query"