prefabs fix & scene update
Merge branch 'master' of https://github.com/lucaslg/Ludum-Dare-31