redirect after login
Merge branch 'master' into api