Add merge to Dao. Also, improve javadoc (including @see references to the Hibernate methods to give users more places to go for documentation)
remove deprecated Dao method, minor javadoc additions