fix updating ssh key
prepare to implement quotas
Merge branch 'origin/master'