Turn Beacons off when navigating back to main screen
Merge remote-tracking branch 'origin/master'