Updates, not working !
Merge branch 'master' of
ssh://git@github.com/JacketCraft/JacketCraft.git

Conflicts:
	src/org/JacketCraft/Jacket/Server.java