http fix
Merge branch 'master' of https://github.com/webrtcHacks/WebRTC-Camera-Resolution