app.yaml and dust parameter change
Merge branch 'marcia' into sprint5

Conflicts:
	app.yaml