Modifications and additions related to UX task# TC-753
Merge branch 'master' of https://github.com/RSV2/foliage

Conflicts:
	css/dist/thirdchannel.css
	dist/app.js
	dist/app.js.map
	js/app/routers/router.js
Merge branch 'master' of https://github.com/RSV2/foliage

Conflicts:
	css/dist/thirdchannel.css
	dist/app.js
	dist/app.js.map
	js/app/routers/router.js