fn error
Merge branch 'develop' of https://github.com/javamonkey/beetl2.0 into develop

Conflicts:
	beetl-core/src/main/java/org/beetl/core/lab/hello.txt