updated files
Merge branch 'master' of git@github.com:alfredkam/Boilerplates.git

Fixed Conflicts:
	Marionette/js/views/app/demo/TestInputsView.js
	Marionette/js/views/app/demo/demoLayout.js
	Marionette/tpl/app/demo.mustache
	Marionette/tpl/app/testInputs.mustache