small fix
merge conflict
Merge branch 'booking_bugfixes_4' of https://github.com/jakoblaegdsmand/bluebottle into booking_bugfixes_4