Merge branch 'master' of https://github.com/TheGamersCave/TotalWar.git

Conflicts:
	TotalWar/src/com/caved_in/Config/JailConfig.java
	TotalWar/src/com/caved_in/Events/PlayerInteractedEntity.java
	TotalWar/src/com/caved_in/Handlers/CouplesHandler.java
	TotalWar/src/com/caved_in/Handlers/ItemHandler.java
	TotalWar/src/com/caved_in/Handlers/PlayerHandler.java
	TotalWar/src/com/caved_in/Marriage/Couple.java
	TotalWar/src/com/caved_in/Runnables/MarriageHeartsRunnable.java
	TotalWar/src/com/caved_in/Runnables/Runnables.java
	TotalWar/src/com/caved_in/TotalWar.java
	TotalWar/src/com/caved_in/command_executors/ToggleWarCommandExecutor.java
Merge branch 'master' of https://github.com/TheGamersCave/TotalWar.git
Merge pull request #1 from TheGamersCave/Rehaul

Rehaul