Merge pull request #82 from gyk001/master

2.1.0发布
bugfix:#83 include文件里有格式化函数，抛错后错误信息定位不准确
big bug
bug fix
Merge branch 'develop' of https://github.com/javamonkey/beetl2.0 into develop
bug fix
Merge branch 'develop' of https://github.com/javamonkey/beetl2.0 into develop

Conflicts:
	beetl-core/src/main/java/org/beetl/core/lab/hello.txt
三元表达式，和可变数组bug
for循环变量重复定义bug
可变数组bug
？
bug fix for 2.1.1
bug fix
version
Merge branch 'develop'
[maven-release-plugin] prepare release v2.1.1