- Login finished (facebook logs out with everything - facebook guidelines)
Merge remote-tracking branch 'origin/master'