Added login/signup
Merge branch 'security'