Merge branch 'develop'
Extract some stats from db for Carla.
Bugfix: 'Efivarenz' and 'Stavudine' medicines not captured.
Bugfix: don't render admin login forms.
Consolidate dosage forms.
Clean Procurement 'container' field.
Merge branch 'master' into develop