Merge remote-tracking branch 'iBeacon_sl/master'