hotfix for file permissions checking
fixed up file/image testing
Merge branch 'master' into develop
Merge develop
Fix merge