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