I've added CartDao class in the package
Merge origin/master