Merge pull request #442 from pfschwartz/develop

Fixed issue with activating typeOfSample
Merge develop/develop into develop
Fixed issues on Reports and Password message