Merge branch 'master' of https://github.com/AlexPush/checkmymeds

merging fabians changes
fixed active substance parsing bug
fixed active substance parsing bug