Merge branch 'master' into Johnny!

* master:
  Added thought bubbles
Merge branch 'master' into Johnny!

* master:
  Edited AI script slightly Added thought bubble render appear and disappear
  Put in dead bodies. They are in prefabs/Tenant/DeadTenant
Hopefully fixed the spring animation?
Merge remote-tracking branch 'origin/Johnny!'
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs
Merge branch 'master' into romans-design

* master:
  Hopefully fixed the spring animation?
Created a CharacterRoomLocation script