Updates architecture
Merge pull request #21 from fbouquet/hibernate_to_dao

Updates architecture