final re-commit from demo
Merge branch 'master' of https://github.com/sjokoladevx/ProjectCode

Conflicts:
	libcflie_delivery/src/control/control.cpp