added sampleId to func Entity
Merge branch 'master' of https://github.com/CBIIT/cananolab.git