fixed house
Merge branch 'master' of https://github.com/Zbrana/PA165-HAUNTED-HOUSES

Conflicts:

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/entity/House.java

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/entity/Resident.java
Merge branch 'master' of https://github.com/Zbrana/PA165-HAUNTED-HOUSES

Conflicts:
	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/DAODemo.java

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/dao/jpa/PowerDAOImpl.java