hibernate in progress
hibernate in action
Merge remote-tracking branch 'remotes/origin/univertorevert' into b1

Conflicts:
	university-hibernate/src/main/java/university/dao/CourseDao.java
	university-hibernate/src/main/java/university/dao/CourseDaoImpl.java
	university-hibernate/src/main/java/university/dao/LessonDao.java
	university-hibernate/src/main/java/university/dao/LessonDaoImpl.java
	university-hibernate/src/main/java/university/dao/TeacherDao.java
	university-hibernate/src/main/java/university/dao/TeacherDaoImpl.java
	university-hibernate/src/main/java/university/domain/Course.java
	university-hibernate/src/main/java/university/domain/Lesson.java
	university-hibernate/src/main/java/university/domain/Teacher.java
	university-hibernate/src/main/resources/application-Context.xml
	university-hibernate/src/main/resources/persistence.xml
	university-hibernate/src/test/resources/application-Context-test.xml
	university-hibernate/university-hibernate.iml
	university-hibernate/university-hibernate.ipr
	university-hibernate/university-hibernate.iws
Merge remote-tracking branch 'remotes/origin/univertorevert' into b1

Conflicts:
	university-hibernate/src/main/java/university/dao/CourseDao.java
	university-hibernate/src/main/java/university/dao/CourseDaoImpl.java
	university-hibernate/src/main/java/university/dao/LessonDao.java
	university-hibernate/src/main/java/university/dao/LessonDaoImpl.java
	university-hibernate/src/main/java/university/dao/TeacherDao.java
	university-hibernate/src/main/java/university/dao/TeacherDaoImpl.java
	university-hibernate/src/main/java/university/domain/Course.java
	university-hibernate/src/main/java/university/domain/Lesson.java
	university-hibernate/src/main/java/university/domain/Teacher.java
	university-hibernate/src/main/resources/application-Context.xml
	university-hibernate/src/main/resources/persistence.xml
	university-hibernate/src/test/resources/application-Context-test.xml
	university-hibernate/university-hibernate.iml
	university-hibernate/university-hibernate.ipr
	university-hibernate/university-hibernate.iws
Merge remote-tracking branch 'remotes/origin/univertorevert' into b1

Conflicts:
	university-hibernate/src/main/java/university/dao/CourseDao.java
	university-hibernate/src/main/java/university/dao/CourseDaoImpl.java
	university-hibernate/src/main/java/university/dao/LessonDao.java
	university-hibernate/src/main/java/university/dao/LessonDaoImpl.java
	university-hibernate/src/main/java/university/dao/TeacherDao.java
	university-hibernate/src/main/java/university/dao/TeacherDaoImpl.java
	university-hibernate/src/main/java/university/domain/Course.java
	university-hibernate/src/main/java/university/domain/Lesson.java
	university-hibernate/src/main/java/university/domain/Teacher.java
	university-hibernate/src/main/resources/application-Context.xml
	university-hibernate/src/main/resources/persistence.xml
	university-hibernate/src/test/resources/application-Context-test.xml
	university-hibernate/university-hibernate.iml
	university-hibernate/university-hibernate.ipr
	university-hibernate/university-hibernate.iws
Merge remote-tracking branch 'remotes/origin/univertorevert' into b1

Conflicts:
	university-hibernate/src/main/java/university/dao/CourseDao.java
	university-hibernate/src/main/java/university/dao/CourseDaoImpl.java
	university-hibernate/src/main/java/university/dao/LessonDao.java
	university-hibernate/src/main/java/university/dao/LessonDaoImpl.java
	university-hibernate/src/main/java/university/dao/TeacherDao.java
	university-hibernate/src/main/java/university/dao/TeacherDaoImpl.java
	university-hibernate/src/main/java/university/domain/Course.java
	university-hibernate/src/main/java/university/domain/Lesson.java
	university-hibernate/src/main/java/university/domain/Teacher.java
	university-hibernate/src/main/resources/application-Context.xml
	university-hibernate/src/main/resources/persistence.xml
	university-hibernate/src/test/resources/application-Context-test.xml
	university-hibernate/university-hibernate.iml
	university-hibernate/university-hibernate.ipr
	university-hibernate/university-hibernate.iws
Merge branch 'b1'

Conflicts:
	university-hibernate/university-hibernate.iws