VE update
Merge branch 'master' of https://github.com/ging/vish

Conflicts:
	vendor/plugins/vish_editor/app/assets/javascripts/vishEditor.min.js
	vendor/plugins/vish_editor/app/assets/stylesheets/all/editor.css