Added new error message
Merge branch 'master' of github.com:CHH/meta-template

Conflicts:
	lib/MetaTemplate/Template/Base.php
Merge branch 'master' of github.com:CHH/meta-template