bookinglist style
fixing the merge conflict
Bookinglist and userlist leyout
Merge remote-tracking branch 'origin/dev'