Adding controller for areas_of_study
Updating so that it uses AcademicTopic instead of AreaOfStudy.
Updated fronted toolkit.
Merge branch 'master' into areas_of_study

Conflicts:
	Gemfile
	Gemfile.lock
	app/policies/academic_program_policy.rb
Renaming AcademicTopic to AcademicSubject
Adding support for relating subjects.
Improving query for getting academic subjects
Updated menu block helper
Added meta data controller.
You can now add meta data to academic subjects.
This page is not needed anymore
Merge branch 'master' into areas_of_study
Updating buweb to the latest version to support Academic Subjects
Removing old MetaData code since that got removed in the latest version of buweb
Fixing activity log for academic subject page since that was never working.
Updating this policy so only admins can index academic subjects.
Simplifying the checkbox columns by using css columns instead of calculating them myself.
Updating buweb to the latest version.
.admin? already checks if .developer?
Removing ability to edit path since it is built automatically now.
Merge pull request #13 from biola/areas_of_study

Add academic subjects