Bugs fixes
Nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/minecraft/server/dedicated/DedicatedServer.java
Merge branch 'master' of https://github.com/BananaJ/BananaJ1.7.10Beta