Merge pull request #3 from JohnMai/master

Pull Request to Update Fork
Merge pull request #4 from JohnMai/master

Updating Fork Again
Merge pull request #5 from JohnMai/master

Update To Master Again
Merge Stuff

Try to get new info.
Added basic container: itemHider

itemHider hides CaseObjects from view until examined (clicked).

This commit also includes updates to Category in Enums.cs
Removal of unneeded data structures.
Merge pull request #4 from JohnMai/master

Updating Fork
Verified Containers Work Properly

Also took out some debug only code that is obsolete.
Forgot more prints.
The Dictionary is Integrated!

Dictionary (and DictEntry's) are now part of GameManager and Journal
(will help calculate score), as well as NPCs for keeping track of their
knowledge of other characters (important for Dialog tree).  Conversation
class changed to fit Dialoguer, it is still being set up for proper use,
but should integrate easily.
Manually Merging

By hand =(
Merge Setup
My Code Version

For merging
Merging by Hand
Bit more merges.

Curse you unity specific files!  Always so hard to merge.
Prefab Changes
Update to latest Assets
Merged?

I hope it's good.
new scenes and other stuff

new scenes and other stuff
Merge branch 'pr/6'

Conflicts:
	Assets/Scenes/stage1.unity

Merging.