Using colors in calculations
Merge branch 'master' into HEAD

Conflicts:
	cgsql.vcxproj