change bookingTimeOut field from int to Date for Event.class
Merge remote-tracking branch 'origin/master'