Made browserify work with marionette and vendor bundle
Merge branch 'develop'

Conflicts:
	grunt/browserify.js