Merge branch 'release/0.2.0'
got a small type in the render template url
Merge branch 'hotfix/0.2.1' into develop

Conflicts:
	pom.xml