Resolved name conflict
Merge branch 'develop' of https://github.com/labust/vehicles-ros-pkg into develop

Conflicts:
	pladypos/CMakeLists.txt