ready for merge
Merge branch 'new-arch' of https://github.com/subjectsplus/SubjectsPlus into new-arch
fixed save box
Merge branch 'new-arch' of https://github.com/subjectsplus/SubjectsPlus into new-arch