Change 'increase all skills' to something more selective
Invcache peeks instead of reads, fixes #2356
Move getVersionString() declaration to a header file.
Move player memorial string generation to player class.
Merge fix to invlet cache loading eating items.
Remove redundant peek.
Handle new invlet cache lines when loading NPCs.
uimenu: bugfixes and additional helper functions
Merge selective skill increases.

Conflicts:
	game.cpp
Reformat new skill upgrade debug code.
Fix minor bug where 'all skills' and 'first skill' hotkeys collided.
Options put in categories
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into options