refactor + quarter mark feature to journal page
Merge branch 'master' of https://github.com/vsomov/SchoolPortal