Merge branch 'release/2.0.1'
Merge branch 'release/2.0.2'
Merge branch 'release/2.0.3'
Merge branch 'release/2.0.4'
Merge branch 'release/2.0.5'
Merge branch 'release/2.1.0'
Merge branch 'release/2.1.1'
Merge branch 'release/2.1.2'
Merge branch 'release/2.1.3'
Merge branch 'release/2.2.0.beta'
reference omniauth configure for staging
bump version 2.2.0.rc1
Merge branch 'release/2.2.0.rc1'

Conflicts:
	config/environments/staging.rb
bump version 2.2.0.rc2
Merge branch 'release/2.2.0.rc2'

Conflicts:
	config/initializers/nucats_assist.rb
Merge branch 'develop'

Conflicts:
	config/initializers/nucats_assist.rb
set omniauth configuration
Merge branch 'master' into develop