made it go to dashboard if logged in
Merge branch 'master' into design