added inheritance for ColorPicker
Merge branch 'master' of github.com:jimpo/lazertag