Removed feed urls from templace, lives in jsonfeedreader now
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/cab

Conflicts:
	composer.lock
	themes/cab-foundation/templates/Layout/HomePage.ss