add re-encoding of jpg-images because of progressive rendering
rip out re encoding code because it does not solve the problem.
Merge branch 're-encode' into develop