Issue #82 fix.

Conflicts:
	jtwig-core/src/main/java/com/lyncode/jtwig/parser/JtwigExpressionParser.java
Merge pull request #85 from lyncodev/issue82-2.1.x

Issue #82 fix [2.1.3]
Fix for issue #86
Fixed broken test
Merge branch 'issue86-v2.1.x' of https://github.com/lyncodev/jtwig into issue86-v2.1.x