Clean version
Merge pull request #2 from benandow/devel

Hibernate + DAO changes (Cleaned up verson)