Merge branch 'develop'

Conflicts:
	beetl-core/pom.xml
	pom.xml
Merge branch 'master' of https://github.com/javamonkey/beetl2.0
..