Scenarions for filter toggles [#56679840]
Merge branch 'master' of https://github.com/unicefuganda/devtrac2

Conflicts:
	features/terrain.py