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

Conflicts:
	.idea/workspace.xml