Navigation part 1
Merge remote-tracking branch 'origin/master'
Navigation part 2
Navigation part 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/curriculum/MediaFileController.groovy
	grails-app/controllers/curriculum/MediaItemController.groovy
	grails-app/views/mediaFile/create.gsp
delete comperative Exercise