Shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/erebus/item/PortalActivator.java
I like changing stuff