logincontroller edited
Merge branch 'master' of https://github.com/BSSAM/bs