updating activity feed to enable modal and to correct horizontal/vertical positioning of imates
adding next/prev arrows and labels for carousel
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	css/dist/thirdchannel.css
	css/scss/apps/thirdchannel/main.scss
	dist/app.js
	dist/app.js.map