HaHa
HaHa
Merge branch 'master' of https://github.com/wolfwork/Saga

Conflicts:
	README
	config/abilities.json
	config/attributes.json
	config/buildings.json
	config/economy.json
	config/experience.json
	config/factions.json
	config/general.json
	config/proficiencies.json
	config/settlements.json
	src/org/saga/Saga.java
	src/org/saga/buildings/Watchtower.java
	src/org/saga/messages/FactionMessages.java
	src/org/saga/utility/AsciiCompass.java
	src/org/saga/utility/chat/ChatUtil.java
	src/org/sk89q/Command.java
	src/org/sk89q/CommandContext.java
	src/org/sk89q/CommandException.java
	src/org/sk89q/CommandPermissions.java
	src/org/sk89q/CommandPermissionsException.java
	src/org/sk89q/CommandUsageException.java
	src/org/sk89q/CommandsManager.java
	src/org/sk89q/Injector.java
	src/org/sk89q/MissingNestedCommandException.java
	src/org/sk89q/NestedCommand.java
	src/org/sk89q/StringUtil.java
	src/org/sk89q/UnhandledCommandException.java
	src/org/sk89q/WrappedCommandException.java