Another day's worth of work
Merge remote-tracking branch 'origin/lwjgl' into lwjgl

Conflicts:
	src/net/specialattack/settling/Settling.java