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

Conflicts:
	.idea/workspace.xml
	README.md