merging.
Merge commit '70e29920fa68ae5fd77d0517e394c7bed7162832'

Conflicts:
	FearMonger-csharp.sln
	FearMonger.sln
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
Added GameManager class to deal with globals, maps, menus.
Merge branch 'master' of https://github.com/davism4/fearmonger
Rearranged the furniture. Applied some of the sprites. Object detection (in front of the player) is working better. Camera/exiting rooms needs work.