convert big pictures to jpeg before encryption
Merge branch 'master' into gh-pages