Merge pull request #1 from JasonGuanGitHub/master

update from master
Merge pull request #7 from jitongming/master

new customer view and controller