Changed Data and Conditions data structure again
Merge branch 'master' of https://github.com/CBIIT/cananolab