Added a billToLocation
Merge branch 'develop' into feature-standalone