colors
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/common/Settings.js