finish programs
Merge remote-tracking branch 'origin/dev-app' into dev-app

Conflicts:
	modules/mainwindow.py