Remove the DaoImpl and used DAO directly in Service layer.
Merge remote-tracking branch 'origin/master'