added location and basesessionrate
Merge branch 'development' into qa