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

Conflicts:
	cs198pythontest.db
	serveus/views.py