sync
Merge branch 'master' of github.com:Michieljoris/roster_help