added 4 icons for colorpicker + changed conf.py
added 4 icons for colorpicker + changed conf.py
added 4 icons colorpicer to substitions section of documentation guidelines
Merge branch 'master' of https://github.com/diethard2/QGIS-Documentation
Merge pull request #298 from diethard2/master

added 4 icons for colorpicker + changed conf.py