Improve customer DAO, add unit tests.
Merge origin/master