Using backbone instead of marionette
Merge remote-tracking branch 'origin/master'