Merge branch 'dev' into rebuildWithRegionFix

Conflicts:
	lib/backbone.marionette.map
	lib/backbone.marionette.min.js
	lib/core/amd/backbone.marionette.min.js
	lib/core/backbone.marionette.map
	lib/core/backbone.marionette.min.js
	reports/coverage.json
	reports/coverage/index.html
	reports/coverage/spec/javascripts/support/index.html
	reports/coverage/spec/javascripts/support/marionette.support.js.html
	reports/coverage/src/build/index.html
	reports/coverage/src/build/marionette.core.js.html
	reports/coverage/src/index.html
	reports/coverage/src/marionette.application.js.html
	reports/coverage/src/marionette.approuter.js.html
	reports/coverage/src/marionette.bindEntityEvents.js.html
	reports/coverage/src/marionette.callbacks.js.html
	reports/coverage/src/marionette.collectionview.js.html
	reports/coverage/src/marionette.compositeview.js.html
	reports/coverage/src/marionette.controller.js.html
	reports/coverage/src/marionette.domRefresh.js.html
	reports/coverage/src/marionette.helpers.js.html
	reports/coverage/src/marionette.itemview.js.html
	reports/coverage/src/marionette.layout.js.html
	reports/coverage/src/marionette.module.js.html
	reports/coverage/src/marionette.region.js.html
	reports/coverage/src/marionette.regionManager.js.html
	reports/coverage/src/marionette.renderer.js.html
	reports/coverage/src/marionette.templatecache.js.html
	reports/coverage/src/marionette.triggermethod.js.html
	reports/coverage/src/marionette.view.js.html