WCMS-65 Lets you add open hours to departments
Merge branch 'master' into WCMS-65_add_open_hours_to_departments

Conflicts:
	app/assets/javascripts/resources/department.js.coffee
	app/views/departments/_form.html.slim
Merge branch 'master' into WCMS-65_add_open_hours_to_departments
Merge pull request #50 from biola/WCMS-65_add_open_hours_to_departments

WCMS-65 Lets you add open hours to departments
Merge branch 'master' into slugs

Conflicts:
	app/controllers/departments_controller.rb