Rendering
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/specialattack/modjam/client/ClientProxy.java