272-T3: Front-end rendering (not tested with real data) + 258-CR6
Merge branch 'master' of https://github.com/Gapminder/G3
Gapminder Farsi Captions Added
Gapminder Farsi Captions Added
Gapminder Farsi Captions Added
Merge branch 'master' of https://github.com/Gapminder/G3

Conflicts:
	src/i18n/en/cap_en.js
Gapminder Farsi Captions Added
Gapminder Iran Added
272-T3: Front-end rendering - First sketch
Merge branch 'master' of https://github.com/Gapminder/G3