Added reconnect on the internal MJPEG stream
Fixed merge conflict