Changes to integrate July pictures
Fix merge conflicts for fix-changing-pictures
Merge branch 'master' of https://github.com/spyl94/znieh