Changed "logActivity" to take an BeaconActivity object
Changed the description function
Merge remote-tracking branch 'origin/master'