fixed onJoin
Merge remote-tracking branch 'remotes/origin/master' into morefixing

Conflicts:
	src/com/icraftgames/util/SchematicManager.java
Merge pull request #6 from CraftOfClans/morefixing

I'm not sure what's going on here, but I fixed some things.