Merge branch 'navbar' of https://github.com/willisdl/MCToolkit into navbar

Conflicts:
	app/views/devise/registrations/edit.html.erb