Added BeaconActivity and BeaconActivityTests (not done yet)
fixed git issues