Minecraft 1.5.2
Merge branch 'vanilla' into mod

Conflicts:
	net/minecraft/client/Minecraft.java
	net/minecraft/src/RenderPlayer.java
Merge remote-tracking branch 'origin/mod' into mod