Changes to meet coding conventions *DAO* -> *Dao*.  More refactoring for latest spring, hibernate and jpa upgrades.