Moved create model functionality to factory. AH-140
Merge remote-tracking branch 'origin/master' into AH-140_refactor_graphics