ip and commz
spped
Merge branch 'master' of https://github.com/LeTrapeur/libParabole

Conflicts:
	actionsParabole.cpp
	interfaceCmd.cpp

	modified:   actionsParabole.cpp
	modified:   interfaceCmd.cpp