Add user login
Fix merge conflicts on layout and packages
Merge pull request #5 from xamroc/master

User login