changed storage type column heading
corrected linking problem for samples
Merge branch 'develop' into testing