fixed push notification bugs
Merge branch 'development' of https://github.com/andrliu/GoTrip into development