Merge branch 'master' of github.com:dolda2000/salem-client

Conflicts:
	src/haven/Alchemy.java
	src/haven/FoodInfo.java
	src/haven/Gobble.java
	src/haven/GobbleInfo.java
	src/haven/Session.java
	src/haven/Tempers.java
updated changelog
fixed store url
updated changelog.txt
changes to facilitate IDEA project
ignore IDEA files
added ability to display icons for item contents - configured in contents_icons.json
added gson lib
moved stream2str from wiki to util
added option to show/hide contents icons
updated changelog
merged ender's update
Changed the content icons from a jason approach to a hardcoded hashmap