Merge branch 'master' into admin-dashboard

Conflicts:
	Gemfile
move Sidekiq::Web into AdminConstraint block
move dashboard links into a sidebar
Merge branch 'admin-dashboard' of github.com:thomas-mcdonald/qa into admin-dashboard