Prevent auto lock while beacons are active
Added a 2nd ad for tennis. Handle already active ad
Merge remote-tracking branch 'origin/master'