Merge branch 'master' of C:\Users\Balmung\Documents\DjangoCode\SoReWa with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Waiter order products auto refresh