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