QTI Java Library
Minor changes for Toolbar
Merge branch 'enhancedQuizzes' of github.com:ging/vish_editor into enhancedQuizzes
Edit Quiz Settings. First step
Load element settings on VE
First version of Quiz Settings
Merge branch 'master' of github.com:ging/vish_editor into qti

Conflicts:
	public/vishEditor/examples/contents/scorm/javascripts/vishViewer.min.js
	public/vishEditor/js/VISH.Editor.Quiz.js
Add button to export Quiz to IMS QTI 2.1
Merge branch 'master' of github.com:ging/vish_editor into importQTI

Conflicts:
	public/vishEditor/examples/contents/scorm/javascripts/vishViewer.min.js