modified journal
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/src/main/java/school/model/Course.java
Merge branch 'master' of https://github.com/vsomov/SchoolPortal