Another strange commit
Another strange commit
Merge remote-tracking branch 'origin/master'

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