Release/booking merge

This PR contains fixes and updates that where made in the "release/booking-temp" branch the last weeks. These updates were part of updates to Booking but the Booking code base was unable to handle the latest Bluebottle version. 

The Booking branch is now updated to handle the latest Bluebottle code. Now the minor changes that were made in Booking's specific Bluebottle are moved to Bluebottle master. Most changes are not enhancing Bluebottle per se but rather update Bluebottle so that Booking can work with it.

The fixes and updates are mainly about:
- Updating templates (e.g. using partials)
- Including tests for sending mails
- Moving Storyfield to Bluebottle (Booking, however, doesn't use this)
- Removing old unused code in components
- Including Bookings updated map (this is Bluebottle code but extended)
- Small fixes for handling pictures