added features to journal and diary.
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/.classpath
	school-service/.classpath