* If the stream is displayed in a microblog context,
  filter activity stream on activities within this context.
  [tdesvenain]
Merge branch 'master' of github.com:cosent/plonesocial.activitystream

Conflicts:
	CHANGES.txt
merged
filtering on microblog context works with new API
symlink is back
french translation
fix message folder
pep8
filter on users OR microblog context, not both