sick launch cleanup
Merge branch 'master' of https://github.com/Osiron007/neo_mp_400_full
Merge branch 'master' of https://github.com/Osiron007/neo_mp_400_full

Conflicts:
	src/neo_driver/neo_base_mp_400/ros/launch/sick/sick_s300.launch