location stuff
Merge remote-tracking branch 'origin/master'
background updates
Merge remote-tracking branch 'origin/master'
initial work on incoming messages
Merge remote-tracking branch 'origin/master'
work on notification
Merge remote-tracking branch 'origin/master'