Fixed CSV parser

implemented conditional for formularydrug. If the drug already exists
in the supplylist, a new strength is added to that strengthList rather
than creating a new drug object
CSV parser grammar check

Removed a todo, refactored (renamed) getDrugInSystem(). Attempt merge…
Merge pull request #1 from chan-kelv/Kelvin-branch

Kelvin branch