SAML認証
Merge branch 'master' of ssh://github.com/LGDIS/LGDSF

Conflicts:
	config/initializers/omniauth.rb