Merge remote-tracking branch 'origin/test' into develop

Conflicts:

_gh-pages/node_modules/grunt-webfont/node_modules/svgicons2svgfont/READM
E.md
	icons/left-1.svg
	icons/right-1.svg
	src/alphabet.ai