Login functionality is done
Merge origin/master