closed #42
Merge branch 'feature/42-deletion-order-for-time-slot-activities' into dev
fixed #43
Merge branch 'bug/43-midnight-time-change' into dev