Grouped similar content and added DragText
Fixed hotspot icons to new font, and included markthewords dragtext singlechoice
Resolve conflicts
Merge branch 'toolbar-fix'