Merge pull request #1271 from jh3y/master

Resolves #1270 by moving backbone.history.start invocation

examples/backbone_marionette/index.html

@@ -71,6 +71,9 @@
 		<script src="js/TodoMVC.TodoList.js"></script>
 		<script>
 			$(function () {
+				TodoMVC.on('start', function() {
+					Backbone.history.start();
+				});
 				// start the TodoMVC app (defined in js/TodoMVC.js)
 				TodoMVC.start();
 			});

examples/backbone_marionette/js/TodoMVC.js

@@ -21,7 +21,6 @@ window.TodoMVC = new App();
   });
 })();
 
-TodoMVC.on('start', function () {
+TodoMVC.on('before:start', function () {
   TodoMVC.setRootLayout();
-  Backbone.history.start();
 });