styles etc
Merge branch 'development' of https://github.com/subjectsplus/SubjectsPlus into development