Gradle-ized the applet, merges the core jar into the applet jar
Merge branch 'master' into applet

Conflicts:
	settings.gradle