Merge pull request #330 from FEMR/development

Development
Merge pull request #341 from FEMR/development

Candidate for 2.1.0
Merge pull request #343 from FEMR/development

Development
Merge pull request #345 from kevinzurek/development

quickly fix bug where duplicate medication names appear on pharmacy type...
Research Feature complete
update contributors