Fixed buildouts loading order and assembly

All Cells are first instantiated and then added to their parent
buildings
Merge remote-tracking branch 'origin/master' into FixFixFix
Merge pull request #1226 from CharonInferar/FixFixFix

Fixed buildouts loading order and assembly