*added colorpicker
Merge branch 'develop' of github.com:open-steam/koala into develop