zzzz
Merge branch 'generic' of https://github.com/CVMIG/Malaria-Server into generic