modify standar edit flow
Merge branch 'origin/develop'

Conflicts:
	extjs-app/foodprint.xds