progress is shown when creating the default key based on number of keys created so far
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
Merge pull request #368 from ajit766/master

 progress is shown when creating the default key based on number of keys created till then
Merge pull request #380 from uberspot/master

Colorize fingerprint
remove unneeded replace for newline on fingerprint
Fix to passphrase dialog and Issue #207
ViewHolder Pattern Implemented
Highlight search query in SelectPublicKeyFragment and
KeyListPublicFragment
Issue #378 ( private keys are no longer red ): Fixed
Merge pull request #385 from tharinduwijewardane/master

Issue #378 ( private keys are no longer red ): Fixed
Create custom HighlightQueryCursorAdapter
Merge remote-tracking branch 'upstream/master' into search1
remove double definition of progress_generating
Cleanup ImportKeysListEntry
Merge pull request #384 from mb-14/search1

Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
Improve hightlight query code: make cursor abstract, tidy up code