add logout and tweak carpool query
Merge branch 'Merged'