Merge pull request #226 from lucacasagrande/master

Print composer update
added link to a post about rule based renderer
Merge pull request #227 from mbernasocchi/patch-1

added link to a post about rule based renderer
update
new icon
formatted code text, tried to format Labeling point layers
Users Manual - screenshot resize - Grass integration
screenshots to 135 dpi print resolution
Screenshots - remove size settings in rst files
Screenshots remove image size settings
Merge branch 'img_sizes' of https://github.com/SrNetoChan/QGIS-Documentation into img_sizes
Merge pull request #228 from SrNetoChan/img_sizes

Img sizes
update --help output
another small update
moved icons
added SPIT information into table core plugins
formatted code text
first step for updating transifex to 2.2 sources
Revert "first step for updating transifex to 2.2 sources"

This reverts commit 4fa16ac6da5eee697ba23829cd788f78d1ee1dd6.
added another example