Added sshkey field to usertable
Merge branch 'ssh_public_keys' into develop