Renamed some files and changed added a couple of ids
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/school/ContentController.groovy