Add simple grouping of content types in drop-down
Merge commit 'e7e8094a8c5cac67a42a1f7e62993ae5834f4ce0' into HEAD