location views: remove unused code
Merge branch 'master' into test
market place menu views: Added the rest of the stations to the burge api
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/test' into prod