fix permissions
merge master
Merge branch 'master' into server
Merge branch 'master' into server
fix deploy commands