minor change to z-index of custom menu
Fixing custom icons on manage courses screen
Fix for indenting of categories
Merge remote-tracking branch 'upstream/master'