fix double @
added friends list
Merge branch 'master' of github.com:shamelessly/daemon