Card #61: separate gp and standard medications lists
Merge remote-tracking branch 'origin/develop' into develop