Updates Marionette to v.1.0.4
Merge branch 'develop'