running editor config across every file to ensure uniform encoding and whitespace
Merge branch 'master' of https://github.com/IMOD-ASU/imod into fixing-formatting

Conflicts:
	grails-app/conf/BootStrap.groovy
	grails-app/conf/Config.groovy
	grails-app/views/learningObjective/_learning_objectives_list.gsp
	grails-app/views/learningObjective/_learning_objectives_main.gsp
Merge branch 'master' of https://github.com/IMOD-ASU/imod into fixing-formatting

Conflicts:
	CONTRIBUTING.md
	grails-app/domain/imodv6/LearningObjective.groovy
	grails-app/views/learningObjective/_learning_objectives_definition.gsp
	grails-app/views/learningObjective/_learning_objectives_list.gsp
Merge branch 'master' of https://github.com/IMOD-ASU/imod into fixing-formatting

Conflicts:
	grails-app/conf/ApplicationResources.groovy
	grails-app/views/imod/create.gsp
	grails-app/views/imod/edit.gsp
	grails-app/views/layouts/main.gsp
	grails-app/views/learningObjective/_learning_objectives_creator.gsp
	grails-app/views/learningObjective/_learning_objectives_main.gsp
	web-app/css/source/imod.css
	web-app/js/source/imod.create.gsp.js
resolving formatting from merged content
fixing all references to ubuntu font
Merge pull request #44 from IMOD-ASU/fixing-formatting

Fixing Formatting