Fixed Bonjour on mac
Merge branch 'master' of https://github.com/Nivl/nao-car

Conflicts:
	NaoCar/VRemote/Sources/MainWindow.cpp
	NaoCar/VRemote/Sources/MainWindow.hpp