SCAL-542: Showing login screen with PL-Grid OpenID if using server_name with cyfronet and plgrid domains; redirecting to intended action
Merge branch 'hotfix-plgrid-login' into development

Conflicts:
	app/controllers/application_controller.rb