Updates ckeditor update location
Merge branch 'master' of https://github.com/reggieb/SelfAssessment

Conflicts:
	app/admin/questionnaires.rb