Beginning to update to 1.5.
Merge branch 'master' of https://github.com/Nukkit/Client

Conflicts:
	src/minecraft/fr/nukkit/blocks/BlockChair.java
	src/minecraft/net/minecraft/src/EntityPlayerMP.java