added stuff for journal
Merge branch 'master' of https://github.com/vsomov/SchoolPortal

Conflicts:
	school-dao/.classpath
	school-dao/.settings/org.eclipse.jdt.core.prefs
	school-dao/.settings/org.eclipse.wst.common.project.facet.core.xml
	school-dao/src/main/java/school/model/User.java
	school-service/.classpath
	school-service/.settings/org.eclipse.jdt.core.prefs
	school-service/.settings/org.eclipse.wst.common.project.facet.core.xml
	school-web/.classpath
	school-web/.settings/org.eclipse.jdt.core.prefs
	school-web/src/main/webapp/views/tiles/sidebar.jsp