Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb