make question name and icon part of the mugtype definition, and refactor to enable that
add missing jstree types
fix order of includes in tests