Merge branch '1.5.1-ml' into 1.5.1-spout-ml

Conflicts:
	src/minecraft/net/minecraft/src/ItemRenderer.java
	src/minecraft/net/minecraft/src/RenderItem.java
	src/minecraft/net/minecraft/src/RenderManager.java