final changes for pull request
Merge branch 'master' of github.com:wwforg/TeamworkEnglewoodGit