stuff
Routing / Licensing
Merge branch 'dev' of github.com:pixelandtonic/Craft-Docs into dev

Conflicts:
	source/reference/routing.rst
links
Add templating link
Stuff
Merge branch 'dev' of github.com:pixelandtonic/Craft-Docs into dev

Conflicts:
	source/index.rst