Updated from snapshot to 0.2 release
Merge remote branch 'origin/unstable_staging'

Conflicts:
	build.gradle
	build.upload
	pom.xml

Merging in 0.3 staging into master, since that is now the next release