98% done Final stretch
Merge branch 'master' of https://github.com/jedibear/PocketRosterFinal

automerge