Registered for push notifications, added buttons to main screen
Merge remote-tracking branch 'origin/master'
blah
blah