Merge branch 'master' of git://sh.seatribe.se/salem-client

Conflicts:
	src/haven/CharWnd.java
	src/haven/ChatUI.java
	src/haven/Inspiration.java
	src/haven/LocalMiniMap.java
	src/haven/Session.java
updated changelog
made gobs with defined icons show on radar if radar icons option is turned on, even if they are not configured in radar config.
Merge branch 'master' of https://github.com/EnderWiggin/Custom-Salem into new_master
Merge branch 'master' into new_master
Small fix for StatReport