Fixed a syntax error
Stupid Sphinx
Templating stuff
Merge branch 'dev' of github.com:pixelandtonic/Craft-Docs into dev

Conflicts:
	source/diving-in/templates/index.rst