Merge branch 'master' into javascript_interactive
Shows labels for type, note, labels are blocking...
Added '?' to option in type selector
Merge branch 'javascript_interactive'