migration to new mahine commit, adjustments
Merge branch 'debug'

Conflicts:
	app/controller.py