added showing annotations when users exist within a beacon
Merge remote-tracking branch 'origin/master'