Added login functionality
Merge origin/master