x function
Merge branch 'master' into dev

Conflicts:
	Twig/FunnyExtension.php
Merge pull request #2 from gajdaw2/dev

x function