Merge branch 'master'

Conflicts:
	bin/jarlist.cache
More JAR Changes