base update test
Merge branch 'base'

Conflicts:
	src/minecraft/net/minecraft/src/NetClientHandler.java