Upgraded backbone.marionette to 1.0.4.
Merge pull request #1536 from KenPowers/master

Upgraded backbone.marionette to 1.0.4