"Added a new controller class for the diplomacy map and added functions to call it"
Merge branch 'master' of https://github.com/cjeffery/sworsorc

Conflicts:
	src/client/mainswordsorcery/Game.java
	src/client/mainswordsorcery/HUDController.java
Merge branch 'master' of https://github.com/cjeffery/sworsorc