3.0 version bump
Merge branch 'release/3.0' into develop

Conflicts:
	.gitattributes
	build.gradle