minor changes
Merge branch 'master' of github.com:NAMD/AlertaDengue

Conflicts:
	AlertaDengue/AlertaDengue/urls.py