add more icons
Merge branch 'master' into dev-icons

Conflicts:
	contextmenu.js
detach submenu arrow from menu item
add icons for submenus
grey out inactive submenu icon
don't show inactive submenus
merge dev-icons (closes #37)