Adapt some specs to new BookingTemplate.to_s.
Merge remote-tracking branch 'origin/staging'
Update CHANGELOG.