rebuild
redirected login if already logged in
Merge branch 'dev'
rebuilt with updates