Fixed product editing
Merge branch 'dev'