Remove the alert on the live instance
Moving CONFIG to prototype var in componentjs
Fake bullet points all look the same
Fix masterclasses json-parsing bug
Removed config getter from componentjs
Merge pull request #2411 from guardian/kc-masterclass-parse

Commercial: Fix masterclasses json-parsing bug
Merge pull request #2409 from guardian/bullet-points-fix

Fake bullet points all look the same - Fixes #2407
Merge pull request #2388 from guardian/fuck-alerts

Remove the alert on the live instance
Merge branch 'master' of https://github.com/guardian/frontend into component-config-refactor
Adding right ear to the mix
Update jobs url
Merge pull request #2416 from guardian/component-config-refactor

Component config refactor
Merge branch 'master' of https://github.com/guardian/frontend into nextgen-pick-button

Conflicts:
	common/app/assets/javascripts/modules/discussion/comments.js