mjpeg_server source and doc branches added
Merge branch 'master' of github.com:ros/rosdistro
Merge pull request #3753 from rctoris/master

mjpeg_server source and doc branches added