Merge remote-tracking branch 'origin/update-farhan' into update-sharvy
Changed billing setting routing for giver and seeker.
Misc updates