Merge branch 'master' of https://github.com/mensreaMC/Deus-Ex-Machina

Conflicts:
	gradle/wrapper/gradle-wrapper.properties