Merge branch 'develop'
Merge branch 'develop'
Permission Fix

Hotfix for file permissions.
Nothing major.
Merge branch 'master' into develop