Fix offered rides, add methods for credit operations
Merge branch 'master' into dev