udoo
Merge branch 'master' of https://github.com/flashbac/esd_projekt

Conflicts:
	server/threadedServer/src/SerialWrapper.cpp
	server/threadedServer/src/SerialWrapper.h
	server/threadedServer/src/settings.h