Added new take medication classes, time list collection data added
Merge remote-tracking branch 'origin/master'