Megre change from branches (factory, specmodels)
Merge pull request #21 from MeterSoft/edit_change

Megre change from branches (factory, specmodels)