stm working
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	CMakeLists.txt
	Makefile
	README.md
	communication/BaseConnection.cpp
	communication/BaseConnection.h
	communication/Buffer.cpp
	communication/Buffer.h
	communication/Client.cpp
	communication/Client.h
	communication/Encodings.cpp
	communication/Encodings.h
	communication/Header.cpp
	communication/Header.h
	communication/Mailbox.cpp
	communication/Mailbox.h
	communication/MailboxEntry.cpp
	communication/MailboxEntry.h
	communication/Makefile
	communication/Makefile.sources
	communication/Message.cpp
	communication/Message.h
	communication/Server.cpp
	communication/Server.h
	communication/ServerComponent.cpp
	communication/ServerComponent.h
	communication/ThreadedClient.cpp
	communication/ThreadedClient.h
	communication/ThreadedComponent.cpp
	communication/ThreadedComponent.h
	communication/rhobanProtocol.h
	communication/tests/Makefile.sources
	communication/tests/TestEncoding.h
	communication/tests/TestMessage.h
	communication/tests/allTests.cpp
	config/Config.h
	config/Makefile
	config/Makefile.sources
	config/MoveSchedulerConfig.cpp
	config/PwmConfig.cpp
gitignore
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	communication/BaseConnection.cpp
	communication/Mailbox.cpp
	communication/Mailbox.h
	communication/Message.cpp
	communication/Message.h
	communication/Server.cpp
	communication/ServerComponent.cpp
	communication/ServerComponent.h
	communication/rhobanProtocol.h
	motion/StmSpawn.cpp
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	communication/Message.cpp
	communication/Message.h
	motion/StmSpawn.h
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	communication/rhobanProtocol.h
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	communication/Server.cpp
	communication/Server.h
	communication/rhobanProtocol.h