implement pairing exercise
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/curriculum/ExerciseController.groovy
	grails-app/controllers/curriculum/MediaFileController.groovy
	grails-app/views/mediaFile/create.gsp
fixed