added 4 icons for colorpicker + changed conf.py
new description for the options of identify tool (settings > options > Map tools)
Merge pull request #299 from andremano/master

new description for the options of identify tool (settings > options > M...
small fixes to integrate (hopefull :)) png icons
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
Merge pull request #300 from andremano/master

small fixes to integrate (hopefull :)) png icons; changed 'colour' to 'color'
First step to move Style library to outside #261
First step to move Style library to outside #261