Some changes
Merge branch 'master' of https://github.com/labust/mzos-ros-pkg
Merge branch 'master' of https://github.com/labust/mzos-ros-pkg
Added new target file
Merge branch 'master' of https://github.com/labust/mzos-ros-pkg

Conflicts:
	mzos_launch/launch/pladypos/control.launch
img_proc.launch updated