asset compile
Merge branch 'develop'

Conflicts:
	public/production/manifest.yml
update activity feed
Change activity feed dir
fix pagination for activity feed
fix pagination for activity feed
setting up activity feed scroll