customer controller is done partially,,run it
Merge origin/master