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.
added new radar shape - pentagon
updated radar config - added spiders, wells and mines
fixed degree symbol in darkness tool
fixed path to screenshot upload
added ability to save screenshots locally
added support for "Include UI on screenshots" and "Take screenshots silently" options to screenshooter
updated changelog.txt
added cranberries to radar
merged Ender's changes
Merged ender's changes, screenshooting still broken
Fixed GL issues by disabling anti-aliasing again