Merge remote-tracking branch 'origin/beta' into 1.5

Conflicts:
	build.xml
	client/eplus/client/GuiEnchantmentPlus.java