initial commit
Login fix
Merge origin/master