Update backbone and marionette
Merge pull request #536 from zhamid/master

Add "template" to backbone and a very basic marionette definition