Merge pull request #292 from diethard2/master

composer replaced 3 screenshot, added info on rotation and no export of ...
[style] add information about contextual menu in class Fix #281
Merge remote-tracking branch 'upstream/master'
added 4 icons for colorpicker + changed conf.py