changed login
fixed login
Merge branch 'master' into victoria