beginning of proximity stuff
add more proximity settings
Merge branch 'master' of https://github.com/aaronlifshin/meetingpulse