fix errors with session test
merging
Merge branch 'master' of https://github.com/UCHIC/ODM2
change all of the schemas to ODM2