added password/user remembering
Merge remote-tracking branch 'origin/master'