Preparing for 0.2 release
Merge branch 'release/0.2' into develop

Conflicts:
	pom.xml