Merge branch 'develop'
fix PictureFrame to cope with adding and deleting files while running
Merge branch 'master' into develop