Random fixes
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/dynious/refinedrelocation/proxy/ClientProxy.java
	src/main/java/com/dynious/refinedrelocation/renderer/ItemRendererRelocator.java