Merge pull request #174 from pfschwartz/develop

Deactivated tests which had sample type of Free text
Bug corrected localization on report

https://www.pivotaltracker.com/story/show/70900810