DAO and DAOImpl are added
Merge origin/master