Merge pull request #1 from iapain/master

Macro related bugfixes.
#144 "for" tag optimization
#144 Rebuild
Merge https://github.com/justjohn/twig.js.git into git@github.com:FoxyCart/twig.js.git

Conflicts:
	twig.min.js
	twig.min.js.map
Syncing with John's repository
#168 Add support of template_from_string()
#168 "Include" tag now supports the output of the function "template_from_string"
#168 Rebuild
#168 Tests for template_from_string()
#168 Don't throw an exception if the template is undefined
#168 Rebuild
Merge branch 'template_from_string'
#170 Don't throw an exception when concatenating null values

"a != null" includes "a !== null" and "a !== undefined"
#170 Rebuild
#170 Test
Merge branch 'avoid-exception-on-concatenation-of-nulls'

Conflicts:
	twig.min.js
	twig.min.js.map
#182 Allow overriding of imported blocks
#182 Rebuild
Merge pull request #2 from FoxyCart/allow-overriding-imported-blocks

Allow overriding imported blocks
conflicts merged