Merge pull request #298 from diethard2/master

added 4 icons for colorpicker + changed conf.py