update activity feed
update activity feed
Merge branch 'develop'

Conflicts:
	public/production/manifest.yml