went through everything and did some cleanup and fixing
Merge pull request #3 from CraftOfClans/cleanup

went through everything and did some cleanup and fixing
Merge remote-tracking branch 'remotes/origin/master' into morefixing

Conflicts:
	src/com/icraftgames/util/SchematicManager.java