database stuff
Merge branch 'master' into sessions_work