small fix autologin
Merge branch 'friendList' into phase1