created Factory->buildAll
Merge branch 'dev/steve' into develop