Merchant side slots in day
Merge remote-tracking branch 'origin/master'

Conflicts:
	booking/service.py