Merge pull request #336 from diethard2/master

finished update of scale bar composer item
Set a few screenshots to 135 dpiresolution
Merge pull request #337 from SrNetoChan/screenshots

Set a few screenshots to 135 dpiresolution
Updated shapes and arrow composer items including screenshots