DAO refactorings
Merge branch 'master' of github.com:CodeTrials/codetrials