Refactor petType change in server
agrego push notifications
fix merge issues