made various changes to get prefabs set up correctly for all scenes
Merge remote-tracking branch 'upstream/master'