Merge pull request #439 from ruijunhuang2010/master

Merge pull request #22 from ChrisBoesch/master
Update controllers.js
Merge pull request #28 from ChrisBoesch/master

update
debug with client
Merge pull request #440 from LI-HE/master

debug with client
Merge pull request #23 from ChrisBoesch/master

update