Rewrote Templating Docs
Merge pull request #2735 from WouterJ/issue_955

[WIP] Rewrote Templating Docs
[#2735] Minor tweaks to the big, nice refactoring of the templating component done by WouterJ
Merge branch '2.2' into 2.3

Conflicts:
	redirection_map
Merge branch '2.3'