Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Unfinished playerinfo rework
Merge branch 'master' of https://github.com/OzoneH3/Cataclysm-DDA
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Reworked playerinfo to strech with new viewport
Refresh terrain after comparing items from list_items
Reworked playerinfo to strech with new viewport, now with the right file -.-
Player info menu, set smalest window height to 25
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Fixed mon_info() to work with the new monster view ranges

Only color compas monster direction red if a monster spotted you
Revert specialized outside caching code.
Added Options menu to start menu, updated motd with new links
Correct offset passed into lightmap::is_outside() since it gets LIGHTMAP_RANGE_XY added already.
Merge pull request #153 from OzoneH3/master

Reworked playerinfo to strech with new viewport and added a fancy border
Correct description of static spawn option, thanks to aapo for reporting.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/motd
	game.cpp
	help.cpp