Manual merge for push on adding restaurant

1) Manual merge of VotingActivity
2) New receiver handling, and setup for timer notification
3) Notifications received when adding restaurant are different than
invite notifications on first added restaurant
3) Latest build breaking BEFORE my merge and commits