CustomerDao is ready
Merge origin/master