Added handler for FileHasNoContent exception, some clean up
Added exception for empty files
Added FileHasNoContent string
Little fixes
Added handling for other exceptions in the ImportListLoader.
Added exception is null option to display nothing if no error occured
Fixed some naming
 progress is shown when creating the default key based on number of keys created so far
Fix for #347
use parameter in updateFromKeyserver
Merge pull request #316 from danielhass/import-error

Show error if file import has no content
Revised fix for #347
Fix key id and fingerprint handling, use full key ids
Merge pull request #369 from hav3n/branch-fixes

Fix for #347
Colorize fingerprint
Merge branch 'develop' into master2
progress bar during key creation - minor text change
progress bar while key creation - added plurals based on no.of keys while key creation
Issue #178 - Hide advanced options in EncryptActivity
Merge pull request #372 from rafaelav/master

Issue #178 - Hide advanced options in EncryptActivity