Fixes to show the cost update date correctly
Correctly close the session on expiry
Merge pull request #560 from timschofield/develop

Develop