1.1.5 EnderIO config
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/enderio/SliceAndSpliceRecipes_User.xml
	config/enderio/VatRecipes_User.xml