add redirect url in login/logout page
Merge branch 'master' into sso_poppen