Add State & City in trip address in operator
Merge branch 'master' of https://github.com/hardik-panchal/brilliant