.
Merge branch 'develop' of https://github.com/SwissTPH/openhds-tablet into develop