Adding advert into right column of homepage
adding in the ad slot
Merge branch 'master' of github.com:Financial-Times/next-engels into ad-ads
Merge branch 'master' of github.com:Financial-Times/next-engels into ad-ads
Update README.md
Update README.md
adding adplacement into data model
Merge branch 'master' of github.com:Financial-Times/next-engels into ad-ads
more work on ad placement
ads in currated content
removing jquery
fixing build error
fixing linting errors
no longer passing flags into helper
Merge pull request #109 from Financial-Times/ad-ads
Update ifIsAdSlot.js
Merge branch 'master' of https://github.com/Financial-Times/next-engels into more-button

* 'master' of https://github.com/Financial-Times/next-engels:
  Update ifIsAdSlot.js
  no longer passing flags into helper
  fixing linting errors
  fixing build error
  removing jquery
  ads in currated content
  more work on ad placement
  adding adplacement into data model
  Update README.md
  Update README.md
  adding in the ad slot
  Adding advert into right column of homepage

Conflicts:
	client/main.scss
	server/app.js
	server/controllers/uk-front.js