setColors in colorpicker added
Merge branch 'master' of github.com:tmbo/Roomplanner
Merge branch 'master' of github.com:tmbo/Roomplanner