Set the correct templateVariables path
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	Resources/Private/Layouts/Default.html
	Resources/Private/Layouts/NoHeader.html