Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	src/com/valygard/KotH/KotH.java
	src/com/valygard/KotH/KotHUtils.java
	src/com/valygard/KotH/RewardManager.java
	src/com/valygard/KotH/ScoreboardManager.java
	src/com/valygard/KotH/command/Command.java
	src/com/valygard/KotH/command/CommandInfo.java
	src/com/valygard/KotH/command/CommandManager.java
	src/com/valygard/KotH/command/CommandPermission.java
	src/com/valygard/KotH/command/CommandUsage.java
	src/com/valygard/KotH/command/admin/DisableCmd.java
	src/com/valygard/KotH/command/admin/EnableCmd.java
	src/com/valygard/KotH/command/admin/ForceEndCmd.java
	src/com/valygard/KotH/command/admin/ForceStartCmd.java
	src/com/valygard/KotH/command/setup/ConfigCmd.java
	src/com/valygard/KotH/command/setup/CreateArenaCmd.java
	src/com/valygard/KotH/command/setup/LocationsCmd.java
	src/com/valygard/KotH/command/setup/RemoveArenaCmd.java
	src/com/valygard/KotH/command/setup/RemoveClassCmd.java
	src/com/valygard/KotH/command/setup/SetClassCmd.java
	src/com/valygard/KotH/command/setup/SetHillCmd.java
	src/com/valygard/KotH/command/setup/SetWarpCmd.java
	src/com/valygard/KotH/command/setup/SettingsCmd.java
	src/com/valygard/KotH/command/user/ChooseClassCmd.java
	src/com/valygard/KotH/command/user/ChooseTeamCmd.java
	src/com/valygard/KotH/command/user/InfoCmd.java
	src/com/valygard/KotH/command/user/JoinCmd.java
	src/com/valygard/KotH/command/user/LeaveCmd.java
	src/com/valygard/KotH/command/user/ListArenaCmd.java
	src/com/valygard/KotH/command/user/ListPlayersCmd.java
	src/com/valygard/KotH/command/user/SpecCmd.java
	src/com/valygard/KotH/command/user/StatsCmd.java
	src/com/valygard/KotH/economy/EconomyManager.java
	src/com/valygard/KotH/event/ArenaEndEvent.java
	src/com/valygard/KotH/event/ArenaScoreEvent.java
	src/com/valygard/KotH/event/ArenaStartEvent.java
	src/com/valygard/KotH/framework/Arena.java
	src/com/valygard/KotH/framework/ArenaManager.java
	src/com/valygard/KotH/hill/HillManager.java
	src/com/valygard/KotH/hill/HillTask.java
	src/com/valygard/KotH/hill/HillUtils.java
	src/com/valygard/KotH/listener/GlobalListener.java
	src/com/valygard/KotH/time/AutoEndTimer.java
	src/com/valygard/KotH/time/AutoStartTimer.java
	src/com/valygard/KotH/util/ConfigUtil.java
	src/com/valygard/KotH/util/ItemParser.java
	src/com/valygard/KotH/util/LocationUtil.java
	src/com/valygard/KotH/util/TimeUtil.java
	src/com/valygard/KotH/util/inventory/InventoryManager.java
	src/com/valygard/KotH/util/resources/UpdateChecker.java
	src/com/valygard/KotH/util/resources/Updater.java