More working + fixing bugs!
Clean up workspace
Merge commit '1b433eb' into lwjgl

Conflicts:
	src/net/specialattack/settling/client/SettlingClient.java
	src/net/specialattack/settling/common/Settling.java