Making key generation and key upload more robust
Progress on encrypt-for-all feature, squash me later
Using live dirp and cleanup
Resolving conflicts

Merge branch 'irdan/DirectoryInteraction' into irdan/EncryptionForAllEmails

Conflicts:
	Login/js/new.js