referencing the JELLY_BEAN_MR2 bugfix release
new release referencing the 0.8.4 release

also inlcuding a minor bugfix
newest build tools updates
Merge branch 'master' into release-candidates

Conflicts:
	bootstrapper/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties