Working on UserService
Merge branch 'fares'