saving in order to merge
saving in order to merge
Merge branch 'new-arch' of https://github.com/subjectsplus/SubjectsPlus into new-arch
added stub search form to subjects/ header
Merge branch 'new-arch' of https://github.com/subjectsplus/SubjectsPlus into new-arch