Changed booking interface to account for guests and accessories among other things.
Merge remote-tracking branch 'origin/dev' into dev