Setting app/storage permissions
Merge branch 'master' into develop