fixing conflict
fixing conflict
Merge branch 'master' of github.com:vsomov/SchoolPortal

Conflicts:
	school-model/src/main/java/school/model/Room.java
	school-model/src/main/java/school/model/Schedule.java
	school-web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	school-web/target/m2e-wtp/web-resources/META-INF/maven/lv128/school-web/pom.properties
Merge branch 'master' of github.com:vsomov/SchoolPortal
Merge branch 'master' of git@github.com:vsomov/SchoolPortal.git
lesson entry