Merge branch 'master' of https://github.com/easterism/templater2

Conflicts:
	Templater2.php
Merge branch 'master' of https://github.com/easterism/templater2