reset
Merge branch 'master' of https://github.com/CVMIG/Malaria-Server