updated NanoparticleEntity to NanomaterialEntity and NanoparticleSample to Sample
updated NanoparticleEntity to NanomaterialEntity and NanoparticleSample to Sample

SVN-Revision: 14788

NCIP/cananolab,NCIP/cananolab,NCIP/cananolab