Use Marionette Controller
Merge pull request #1043 from teamso/marionetteController

Use Marionette Controller