Made template.escape to only escape strings.
Merge remote-tracking branch 'origin/master'