Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added libjpeg.lib for windows. static lib for jpeg VS2010