test
Merge branch 'master' into jundong
Update controller.coffee