Merge remote-tracking branch 'origin/develop' into MS-226-featured-article

Conflicts:
	src/documents/index.html.eco
MS-226 Fix merge conflict breakage, and refactor variable names
merge develop
Merge branch 'MS-226-featured-article' into develop