WCMS-102 content editors can now alter their departments, services, and groups short description field
WCMS-109 added the ability to change the published status of a department, service, group and person.
publishing is now only available to admin
Merge branch 'master' into publish
Merge branch 'master' into publish
altered css to be more specific
Merge branch 'master' into publish

Conflicts:
	app/controllers/departments_controller.rb
	app/controllers/groups_controller.rb
	app/controllers/services_controller.rb
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
Merge pull request #22 from biola/publish

WCMS-109 added the ability to change the published status of a departmen...
Merge branch 'master' into service_social_media