Merge pull request #3 from xcechack/master

Classes Ghost, GhostDAO, GhostDAOImpl added
Power added
Merge pull request #4 from xcechack/master

new methods in GhostDAOImpl added
Resident.java - Přidány metody equals a hashcode. DO pom.xml přidána dependency org.apache.derby
Resident.java - Přidány metody equals a hashcode. DO pom.xml přidána dependency org.apache.derby
Merge branch 'master' of https://github.com/Zbrana/PA165-HAUNTED-HOUSES
fixed house
Power improved
implementovány metody v ResidentDAOImpl
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
PowerDAO and PowerDAOImpl corrected
Popis metod v ResidentDAOImpl, metody setHouse a getHouse v Resident.java
Power a PowerDAOImpl opravene a class diagram v2
Aktualizovaný persistence.xml
hashCode, equals and constructor added