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

'Fabian\'s commits'
cleaned model and api
adjusted Schema for easier processing in FE
Merge branch 'master' of https://github.com/AlexPush/checkmymeds

'Fabian's commits'