adding styles for carousel, tabbed-nav and activity feed
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	css/dist/global.css
	css/dist/thirdchannel.css
	css/scss/base/_mixins.scss
	css/scss/modules/_navigation.scss
Merge branch 'master' of github.com:RSV2/foliage

Conflicts:
	css/dist/global.css
	css/dist/thirdchannel.css
	css/scss/base/_mixins.scss
	css/scss/modules/_navigation.scss