conflict with albi's view
positioning upcoming bookings in grid
Merge remote-tracking branch 'origin/develop' into develop