Update to latest base (added util.template)
First util.template encapsulated strings
Merge pull request #1176 from Frenzie/master

First util.template encapsulated strings