Merge remote-tracking branch 'upstream/master' into new-weather-funnels

Conflicts:
	src/game.cpp
	src/game.h
re-add proper get_rot_since arguments lost in merge
Merge pull request #8 from CleverRaven/master
Activate missions for Old Guard Rep
Added Old Guard Missions
Added Old Guard Missions
Added Old Guard Missions

Mission 1 need to point to Mission 2 when it is filled out
Added starts for Old Guard Missions
Added a missing break
Added bandit areas and removed capitalization from 'refugee center'
Added bandit cabin and camp
Added Bandit Cabin
Added Bandit Camp
Added marshal badge

Going to look into making this noticeable in conversation.  Should only be attained in the related quests.
Added multiple instances to increase stability...
Stopped NPCs from shooting at you if they can't see you!
Changed bandit class to NC_SCAVENGER
Added NC_THUG and NC_SCAVENGER describe
Update for new classes and item handling
Inventory Rework and New Classes