Updated org view and roster
Merge branch 'master' of https://github.com/Jacketpages/Jacketpages