lesson 22 prep
lesson 22 prep
Merge branch 'l24'

Conflicts:
	university-hibernate/src/main/java/university/domain/Address.java
	university-hibernate/src/main/java/university/domain/Teacher.java
	university-hibernate/university-hibernate.iws