MVC with BeaconManager in separate
Merge remote-tracking branch 'origin/master'