Fix to be compatible with latest Estimote SDK
Merge remote-tracking branch 'origin/master'