Updated custom layout to work with new version of Marionette
Merge branch 'bookish-only' into dev
Updated Backbone.sync success/error callbacks
Merge branch 'dev' into gh-pages