Namespace change and Twig changes
Merge branch 'master' of git://github.com/anomalylabs/messages-tag

Conflicts:
	composer.json