update file permissions
Merge branch 'tmp'