Many bugfixes

Change-Id: I9a443effe989545538884e0587fd5e5ce61a32c7
Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Added measurements table to E2E tests

Change-Id: I53595cf8cb68c545d9331f83987de58348ce5928
Signed-off-by: Jeremy Ho <jujaga@gmail.com>
Medication template bugfixes

Change-Id: I4d2cdf05dd201686f702a5e2da68b9c2c3905e7d
Signed-off-by: Jeremy Ho <jujaga@gmail.com>