What did I change..?
Merge branch 'master' of https://github.com/MCForge/MCForge-Core

Conflicts:
	src/net/mcforge/server/Server.java