Merge remote-tracking branch 'origin/commit'

Conflicts:
	src/main/java/net/specialattack/modjam/CommonProxy.java
	src/main/java/net/specialattack/modjam/ModJam.java
	src/main/java/net/specialattack/modjam/Objects.java