updated to reflect the model change from NanoparticleSample to sample and NanoparticleEntity to NanomaterialEntity
updated to reflect the model change from NanoparticleSample to sample and NanoparticleEntity to NanomaterialEntity

SVN-Revision: 14806

NCIP/cananolab,NCIP/cananolab,NCIP/cananolab