2.3.0 Release!
Updated versions to 2.4.0-SNAPSHOT for future development
Merge branch 'master' into unstable_staging

Conflicts:
	build.gradle
	build.upload
	pom.xml