update Versionfile
remove comment, not needed. [ci skip]
update versionfile for 2-1-stable support
move the assets to the new paths
update Versionfile for master (2-2-stable)
travis badge for master branch [ci skip]
Merge branch 'master' of github.com:spree/spree_editor

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Conflicts:
	Gemfile
	README.md
	Versionfile
	app/assets/javascripts/admin/spree_editor.js
	app/assets/stylesheets/admin/spree_editor.css
	spree_editor.gemspec