resolved conflict with uncommented svg
Merge branch 'development' of github.com:Google-Drought/UI into development

Conflicts:
	config.py
	templates/droughttool.php