Merge branch 'hotfix/session_trouble'
haven't figured out why sometimes items_display was not written to, but this led to a condition in which data could be overwritten
Merge branch 'hotfix/horrible_bug' into develop