Intermediate save
Flat created on order completion - index Device done
merge conflicts fixed
Merge branch 'adding-device-index'