updating the way module includes are done in many of the activity feed modules
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	dist/app.js
	dist/app.js.map
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	dist/app.js
	dist/app.js.map