WCMS-102 content editors can now alter their departments, services, and groups short description field
Merge branch 'master' into short_description

Conflicts:
	app/controllers/departments_controller.rb
	app/controllers/groups_controller.rb
	app/controllers/services_controller.rb
Merge pull request #21 from biola/short_description

WCMS-102 content editors can now alter their departments, services, and ...
Merge branch 'master' into publish

Conflicts:
	app/controllers/departments_controller.rb
	app/controllers/groups_controller.rb
	app/controllers/services_controller.rb