Need to only display active guides
Merge branch 'development' of https://github.com/subjectsplus/SubjectsPlus into development
Merge branch 'development' of https://github.com/subjectsplus/SubjectsPlus into development