Upgrade to Marionette v2.0.0
Merge branch 'marionette-v2.0.0'

Conflicts:
	bower.json