Preparing to pull art.
Merge branch 'master' of https://github.com/davism4/fearmonger

Conflicts:
	Assets/Scripts/Game.cs
Lots of new stuff works.  AI is fixed (Person.cs), and so is the bug where the people don't leave the room (DoorObject.cs). Lamps are assigned properly (LampObject.cs, RoomObject.cs) and damage is dealt properly (hazard scripts and prefabs). People shout exclamations when damaged. On the map view, the room names vary depending on whether they are locked, vacant, or occupied (Game.cs). Usable energy regenerates over time (PlayerLevel.cs). Changed the physics layers a bit.
Merge branch 'master', changed some scripts, changed physics.
Changes: Fixed collision between people, monster, and walls, so physics/2dphysics updated. Changed prefab names (for easier reading), and people generate random names (viewable in hierarchy, not in game). Changed physics and z-positions in rooms. In Game.cs, the HP bar is only displayed when mouse hovers. Removed debug text. Monster only attacks sane people. Fixed bug where people get stuck at door or at lamp. Added leveling in Player.cs, and person combinations in PersonLists. RoomObject preserves furniture angles.
Merge branch 'master' of https://github.com/davism4/fearmonger
Game.cs - removed else statements when naming rooms in map; instead gets appropriate name from the corresponding room. See my previous commit log for other changes.