Crafting UI 1
Merge remote-tracking branch 'origin/Crafting-2' into Crafting-2

Conflicts:
	src/com/cr/world/TileMap.java