Rushed merge
Hacked commit
Merge branch 'master' of http://github.com/CVMIG/Malaria-Server
Presentation