Merge branch 'feature-2'

Conflicts:
	app.py
fix-1 start
fix-1 progress
Merge branch 'fix-1' into dev

Conflicts:
	app.py