register -> login
Merge branch 'dev' of https://github.com/haharicky/fitness into dev
register -> login