Added a ColorPicker for use with the DrawArea
Merge branch 'master' of https://github.com/wmatson/GameTools
Fixed merge conflict with the vcs.xml file