Beginnings of custom profiles
Merge branch 'master' into custom_profiles

* master:
  Allow custom HTML in menu_block.
  made suggested changes
  gem version bump
  fix spelling mistakes
  Move strong params over to their respective policies.
  WCMS-192 Added the ability on the bio to choose whether a faculty member is emeritus, full time or adjunct. This is reliant on buweb v0.35.0
  Switch to Mongoid session store

Conflicts:
	app/views/people/_menu.html.slim
	app/views/people/profile_pages/_bio.html.slim
WCMS-263 Custom profiles
made active tabs use js instead of having the logic in the controller.
WCMS-2 Custom profiles, image selection
Merge branch 'master' into custom_profiles

* master:
  Removing comment and `set_bio` method. The set_bio method is no longer needed now that the bio controller is handling the bio_edition.
  Hide biola affiliation if none exists. This was throwing an error when creating a new person because affiliations was `nil`.
  It's Monday. I screwed up twice.
  Fixing stray "=" that snuck in.
  Use menu_block in more places.
  WCMS-275 p tags will now be favored over line breaks See: https://github.com/biola/profile-publisher/pull/93
  Removing old bio page that isn't getting used anymore.
  Fixing broken menu on department page.
  Standardizing the way we call redactor This way there is only one place in javascript where it is getting initialized. And the html tells you exactly which buttons should be allowed.
  Add column offset.
  Using distinct is much faster than pluck here. We should still probably memcached this result though since it will hardly ever change. See comments under https://github.com/biola/profile-publisher/commit/afa4a50550aecdd3760a34df5f8f073ea1287764
  Commenting out the action check in menu block
  Moving bio form into it's own controller This will let us persist the form data if there is an error when saving. WCMS-259
  Adding a list of child departments to the department edit page. This completes WCMS-253
  Adding a read only "Biola Affiliations" under the basic info section for a person This completes WCMS-252
  Add a link for admins to delete a person's bio WCMS-261

Conflicts:
	app/assets/javascripts/resources/people.js.coffee
	app/controllers/people_controller.rb
	app/views/people/_menu.html.slim
	config/routes.rb
Bumped buweb
Fixes for adam's comments #1. Using ryan's version of redactor. Properly authorizing custom profiles with pundit. Fix a menu mistake
Fixes for adam's comments number 2. Custom Profile now has a form partial so it isn't as redundant. got rid of old commented code
Fixed custom profile controller to use params[:id], tabs now persist upon save on a custom profile.
Merge branch 'master' into custom_profiles
Merge branch 'master' into custom_profiles

* master:
  Using polymorphic url to redirect to edit view of the bio.
  made suggested changes
  Buweb gem version bump
  WCMS-274 Admin can now upload CV's for people on their bio pages

Conflicts:
	config/routes.rb
Changing the way custom profile editor works.
Before the subitems in the menu worked as javascript tags, now they are links to separate controller actions / pages. This simplifies things and is more consistent with how we are doing things in other places. I had to update the menu_block helper to allow for customizing which actions a link is active on.
Merge branch 'custom_profiles' of github.com:biola/profile-publisher into custom_profiles

Conflicts:
	config/routes.rb
The published? checkbox was not getting styled correctly.
Adding documentation and removing old comment
Changing the publish/unpublish form to just be a link
The style was breaking in different places so this fixes that and makes it a lot simpler.
Fixed the image picker
I didn't take into account the ID of different profiles.
I added an option for passing custom matches like `:id` in addition to `:action` that compares it to the current page params.
Added remove button for custom profiles