Fixes #7
Merge branch 'master' of https://github.com/Katalliaan/Rubedo.git

Conflicts:
	src/main/java/rubedo/common/ContentTools.java
	src/main/java/rubedo/items/tools/ToolBase.java