tentative de merge 4 ^^
Merge branch 'master' of github.com:SalemHarrache/robair-ros-pkg

Conflicts:
	robair_app/launch/tv.launch
	robair_app/scripts/http_streamer.py
Merge branch 'master' of github.com:SalemHarrache/robair-ros-pkg

Conflicts:
	robair_app/scripts/http_streamer.py
	robair_app/src/robair_app/player.py