Updated Marionette dependency to also allow Marionette 2.0
Fixed demo for Marionette 2.0
Updated build