Grouped basic content types together.
Grouped more similar content types together
Changed grouping of icons slightly, to have the primary content types easily accessible.
Merge branch 'newIcons' of github.com:h5p/h5p-course-presentation into newIcons
Resolve conflicts
Merge branch 'newIcons'