LiveCard functionality tweaked in GlassRx
Fixed merged conflicts in AndroidRx