Added ColorPoint2 .xml
Merge branch 'master' of https://github.com/130610/sd-project

Conflicts:
	specs/TODO.txt