Fix for missing BP references
Changed scrap class reference
Merge branch 'LevelGen2'
Merge branch 'master' into Stryker