Added branching functionality
Merge branch 'feature/undo/bootstrap' into develop

Conflicts:
	app/assets/javascripts/models/undotree.js.coffee
	app/assets/javascripts/views/undo.js.coffee