color fix
Merge branch 'master' into redmond

Conflicts:
	client/main.js