Fixed call taxi methods.
Refactored model.
Merge branch 'CallTaxi'