Minor VE changes
Merge branch 'ssupgrade' of https://github.com/ging/vish into ssupgrade
Merge branch 'ssupgrade' of https://github.com/ging/vish into ssupgrade

Conflicts:
	vendor/plugins/vish_editor/app/assets/javascripts/vishEditor.min.js
	vendor/plugins/vish_editor/app/assets/javascripts/vishViewer.min.js
	vendor/plugins/vish_editor/app/scorm/javascripts/vishViewer.min.js