Merge branch 'master' into supportAdvertisementFeatures

Conflicts:
	common/app/assets/stylesheets/module/_article.scss