Added support for converting the screen shots to JPEG as well as support for explicit png screen shots if requested
merged master changes