Merge branch 'release/2.2.0.beta' into develop
omniauth configuration for staging server
remove extra check
bump version 2.2.0.rc1
Merge branch 'release/2.2.0.rc1'

Conflicts:
	config/environments/staging.rb