refactored promise
Merge branch 'feature/mixpanel-update-28-7' of github.com:onepercentclub/bluebottle into feature/mixpanel-update-28-7