update
Merge branch 'master' of github.com:sdu-rsd-group1/FroboMind

Conflicts:
	fmApp/sdu/rsd_group1/HMI/src/main_window.cpp
	fmApp/sdu/rsd_group1/HMI/ui/main_window.ui