javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/dao/ResidentDAO.java

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/dao/jpa/ResidentDAOImpl.java
Merge branch 'master' of https://github.com/Zbrana/PA165-HAUNTED-HOUSES
Opraveny názvy metod v HouseDAOImplTest
Merge pull request #6 from xcechack/master

tests for PowerDAOImpl added
Merge pull request #7 from xcechack/master

funkcni testy pro PowerDAOImpl pridany
100% unit tests for ResidentDAOImpl
fixede addtest
Smazány složky lib, data a datadb (projekt je funkční i bez nich), přidána databáze TestDB (potřeba předělat na in memory)
all unit tests should work

Conflicts:

	HauntedHauses/src/main/java/com/mycompany/hauntedhauses/dao/jpa/ResidentDAOImpl.java
Merge branch 'master' of https://github.com/Zbrana/PA165-HAUNTED-HOUSES
fixed more unit tests
Databáze GhostDB upravena na in memory
projekt rozdělen na dva moduly - dao a service
errors with dependency solved