* edit the onNewIntent
Merge remote-tracking branch 'origin/notification' into notification