Added display for skills and addictions.

Conflicts:
	newcharacter.cpp
Fixed incompatability with newest code.
In order for any profession rebalance to happen, this hardcoded item spawning needs to be removed. I've done it here, but made no content changes - I simply added the missing pockknife and matches to every profession, insuring the same result in the end.
Merge branch 'master' into remove_hardcoded_spawn_items
Merge profession skill/addiction display.
Merge removal of hardcoded pocketknife and matches.