Activity stream of friends (fixes #57)
Merge branch 'dev'

* dev:
  Activity stream of friends (fixes #57)