edit/ delete quantity  (FRONT-END) + stuff around it
Merge remote-tracking branch 'origin/Peter4' into Peter4

Conflicts:
	.idea/workspace.xml
	README.md
	README.md.LOCAL.7164.md