Merge branch 'master' of /var/www/nfq/wedrive with conflicts.
Passsenger state fix (after request to join trip send)