Merge remote-tracking branch 'origin/Major-Refactoring-2' into Major-Refactoring-2

Conflicts:
	src/com/cr/crafting/v2/pattern/KnifePattern.java