fix dao
fix dao
fix dao
f
Merge branch 'master' of https://github.com/Sigma-2014-Video-Rental-Store-Project/Workspace
resolve conflict
some refactor and test dao
Merge branch 'master' of https://github.com/Sigma-2014-Video-Rental-Store-Project/Workspace
some refactor and create test