Adding ssh keys for Alessandro.
Merge branch 'master' into alessandro_ssh_keys

Conflicts:
	templates/ssh/authorized_keys