Added switching between iBeacons
Merge branch 'BeaconBranch'