Tightening up messaging

Tightening up and cleaning up messaging
Starting to Commonize team object and cleanup

Formatting and clean up  Incell editing for teams.. I hope.  Got in a
rabit hole for a bit
Merge branch 'master' of https://github.com/dbigelow25/scaha

Conflicts:
	scaha/WebContent/WEB-INF/templates/layout.xhtml
	scaha/WebContent/managerportal.xhtml