Cambios
Merge https://github.com/ee7git/robot-web

Conflicts:
	mjpg-streamer-code/mjpg-streamer/input_file.so
	mjpg-streamer-code/mjpg-streamer/input_kinect2.so
	mjpg-streamer-code/mjpg-streamer/input_testpicture.so
	mjpg-streamer-code/mjpg-streamer/input_uvc.so
	mjpg-streamer-code/mjpg-streamer/mjpg_streamer
	mjpg-streamer-code/mjpg-streamer/mjpg_streamer.o
	mjpg-streamer-code/mjpg-streamer/output_file.so
	mjpg-streamer-code/mjpg-streamer/output_http.so
	mjpg-streamer-code/mjpg-streamer/output_udp.so
	mjpg-streamer-code/mjpg-streamer/plugins/input_kinect2/input_kinect2.so
	mjpg-streamer-code/mjpg-streamer/plugins/input_testpicture/input_testpicture.so
	mjpg-streamer-code/mjpg-streamer/plugins/input_uvc/dynctrl.lo
	mjpg-streamer-code/mjpg-streamer/plugins/input_uvc/input_uvc.so
	mjpg-streamer-code/mjpg-streamer/plugins/input_uvc/jpeg_utils.lo
	mjpg-streamer-code/mjpg-streamer/plugins/input_uvc/v4l2uvc.lo
	mjpg-streamer-code/mjpg-streamer/plugins/output_file/output_file.so
	mjpg-streamer-code/mjpg-streamer/plugins/output_http/httpd.lo
	mjpg-streamer-code/mjpg-streamer/plugins/output_http/output_http.so
	mjpg-streamer-code/mjpg-streamer/plugins/output_udp/output_udp.so
	mjpg-streamer-code/mjpg-streamer/utils.o

What