enrolment changes
conflict fix
Merge branch 'master' of github.com:benon/discovery_kiosk
hiv stuff