add Login
Merge branch 'master' into lxmdev
change ignore