login controller updated
Merge origin/master