Login

Merge branch with login working on spider