Merge origin/test

Conflicts:
	src/main/java/com/yahoo/phil_work/LanguageWrapper.java
	src/main/java/com/yahoo/phil_work/build
	src/main/java/com/yahoo/phil_work/unbreakable/Unbreakable.java
	src/main/java/com/yahoo/phil_work/unbreakable/UnbreakableEnch.java