UPDATED: booking_history with proper functionality
Merge branch 'zlk'