Update for login page
Merge branch 'master' of https://github.com/KirillParfenkov/pickup2