Merge branch 'devel' of /home/dmitriy/booking with conflicts.
expedia requests
expedia requests