schedule  and all /all
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-dao/src/main/java/school/dao/ScheduleDao.java
	school-dao/src/main/java/school/dao/implementation/ScheduleDaoImpl.java
	school-dao/src/main/java/school/model/User.java
	school-service/src/main/java/school/service/implementation/DiaryServiceImpl.java
	school-web/src/main/webapp/WEB-INF/tiles.xml