WCMS-187 Ability to add and manage courses as well as import them from CSV.
Strip out HTML from the description when displaying it in the index.
WCMS-214 Ability to add and manage catalogs
Bumped buweb to 0.33.0
Whoops committed the wrong gemfile.lock
Quick fixes
More quick fixes
Added non-action permissions
Switching over to pundit for permitted params
Merge pull request #8 from biola/courses

Courses
Adding required configuration to the example file
Merge branch 'master' into degree_requirements

Conflicts:
	app/controllers/attachments_controller.rb