NON-WORKING Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle

3 files changed, 0 insertions, 69 deletions

diff --git a/Resources/graphics/originals/ic_launcher/AUTHORS b/Resources/graphics/originals/ic_launcher/AUTHORS
deleted file mode 100644
index dbfcfb4fc..000000000
--- a/Resources/graphics/originals/ic_launcher/AUTHORS
+++ /dev/null
@@ -1,21 +0,0 @@
-Oxygen for KDE3
-Oxygen Icon Theme has been developed by The Oxygen Team.
-
-Art Director:
-David Vignoni <david@oxygen-icons.org>
-
-Designers:
-David J. Miller <miller@oxygen-icons.org>
-David Vignoni <david@oxygen-icons.org>
-Johann Ollivier Lapeyre <johann@oxygen-icons.org>
-Kenneth Wimer <ken@oxygen-icons.org> 
-Nuno F. Pinheiro <nuno@oxygen-icons.org>
-Riccardo Iaconelli <riccardo@oxygen-icons.org>
-
-Thanks to:
-Lee Olson: Contributed drawing used in application-x-bittorent icon.
-Marco Aurélio "Coré": Improved audio-input-microphone icon.
-Matthias Kretz: Contributed "audio-input-line" device icon.
-Mauricio Piacentini <piacentini@kde.org> : game icons mashup
-
-Repackaged by Luke Channings <thefuzzball2005@gmail.com>
\ No newline at end of file
diff --git a/Resources/graphics/originals/ic_launcher/COPYING b/Resources/graphics/originals/ic_launcher/COPYING
deleted file mode 100644
index 2faa27568..000000000
--- a/Resources/graphics/originals/ic_launcher/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
-The Oxygen Icon Theme for KDE3
-    Copyright (C) 2007 David Vignoni <david@icon-king.com>
-    Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
-    Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
-    Copyright (C) 2007 Nuno Fernades Pinheiro <nf.pinheiro@gmail.com>
-    Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
-    Copyright (C) 2007 David Miller <miller@oxygen-icons.org>
-
-and others
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-Clarification:
-
-  The GNU Lesser General Public License or LGPL is written for
-  software libraries in the first place. We expressly want the LGPL to
-  be valid for this artwork library too.
-
-  KDE Oxygen theme icons is a special kind of software library, it is an
-  artwork library, it's elements can be used in a Graphical User Interface, or
-  GUI.
-
-  Source code, for this library means:
-   - where they exist, SVG;
-   - otherwise, if applicable, the multi-layered formats xcf or psd, or
-  otherwise png.
-
-  The LGPL in some sections obliges you to make the files carry
-  notices. With images this is in some cases impossible or hardly useful.
-
-  With this library a notice is placed at a prominent place in the directory
-  containing the elements. You may follow this practice.
-
-  The exception in section 5 of the GNU Lesser General Public License covers
-  the use of elements of this art library in a GUI.
-
-  kde-artists [at] kde.org
diff --git a/Resources/graphics/originals/ic_launcher/kgpg_key2_kopete.svgz b/Resources/graphics/originals/ic_launcher/kgpg_key2_kopete.svgz
deleted file mode 100644
index 2d43afb83..000000000
--- a/Resources/graphics/originals/ic_launcher/kgpg_key2_kopete.svgz
+++ /dev/null