Updates...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/mcmortals/clans/Main.java