resolve conflicts
add session cookie name
updates
Merge branch 'master' of github.com:Ezekiah/reanalyse into mysql_migration