Changes in journal and diary
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-web/src/main/webapp/views/tiles/sidebar.jsp