Merge pull request #115 from schmandr/master

Update of QGIS Server section: Description of new features in Version 2.0
little changes
added description of WMTS with new figure from Bob Bruce
added description of WMTS with new figure from Bob Bruce
added description of WMTS with new figure from Bob Bruce
finished join menu
Updated indentation of section and subsections
Modified conf.py to include mActionAddHtml icon
Merge pull request #116 from tqhien/master

Updated indentation of section and subsections in Print Composer Chapter
worked on joins and diagrams menu
finished diagram menu
improved sextante toolbox documentation
renamed "sextante" to "processing"
to be able to have translated templates
update icons from default theme
Merge branch 'master' of github.com:qgis/QGIS-Documentation
changed order of menus in vector properties, new chapter display
fix fro not copying static files

temp: fix for missing templates
addition of sphinx.po AND update of all strings
.gitignore fix
Merge branch 'master' of github.com:qgis/QGIS-Documentation