103 files changed, 20 insertions, 1155 deletions
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index f31b6908c..afc95fee8 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     compile project(':libraries:ActionBarSherlock')
     compile project(':libraries:HtmlTextView')
     compile project(':libraries:StickyListHeaders:library')
+    compile project(':libraries:zxing')
 }
 
 android {
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
index 8e240f3c3..73fc44378 100644
--- a/OpenPGP-Keychain/project.properties
+++ b/OpenPGP-Keychain/project.properties
@@ -12,3 +12,4 @@ target=android-19
 android.library.reference.1=../libraries/ActionBarSherlock
 android.library.reference.2=../libraries/HtmlTextView
 android.library.reference.3=../libraries/StickyListHeaders/library
+android.library.reference.4=../libraries/zxing
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
index 4bffd9f3d..13926d172 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyViewActivity.java
@@ -90,7 +90,7 @@ public class KeyViewActivity extends SherlockFragmentActivity implements CreateN
         Intent intent = getIntent();
         mDataUri = intent.getData();
         if (mDataUri == null) {
-            Log.e(Constants.TAG, "Intent data missing. Should be Uri of app!");
+            Log.e(Constants.TAG, "Intent data missing. Should be Uri of key!");
             finish();
             return;
         } else {
diff --git a/README.md b/README.md
index 30c3f01e5..059cbb806 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,9 @@ Android Studio is currently not supported or recommended!
 1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "libraries/ActionBarSherlock"
 2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "libraries/HtmlTextView"
 3. File -> Import -> Android -> Existing Android Code Into Workspace, choose "libraries/StickyListHeaders/library"
-4. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain"
-5. OpenPGP-Kechain can now be build
+4. File -> Import -> Android -> Existing Android Code Into Workspace, choose "libraries/zxing"
+5. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain"
+6. OpenPGP-Kechain can now be build
 
 # Keychain API
 
diff --git a/libraries/StickyListHeaders/build.gradle b/libraries/StickyListHeaders/build.gradle
deleted file mode 100644
index 849b1323c..000000000
--- a/libraries/StickyListHeaders/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
-    }
-}
-
-def isReleaseBuild() {
-    return version.contains("SNAPSHOT") == false
-}
-
-allprojects {
-    version = VERSION_NAME
-    group = GROUP
-
-    repositories {
-        mavenCentral()
-    }
-}
-
-apply plugin: 'android-reporting'
diff --git a/libraries/StickyListHeaders/demo.gif b/libraries/StickyListHeaders/demo.gif
deleted file mode 100644
index d73e3297b..000000000
--- a/libraries/StickyListHeaders/demo.gif
+++ /dev/null
diff --git a/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.jar b/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64a8..000000000
--- a/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
diff --git a/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.properties b/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 0a7effc64..000000000
--- a/libraries/StickyListHeaders/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Nov 19 08:36:06 CET 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
diff --git a/libraries/StickyListHeaders/gradlew b/libraries/StickyListHeaders/gradlew
deleted file mode 100644
index 91a7e269e..000000000
--- a/libraries/StickyListHeaders/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/libraries/StickyListHeaders/gradlew.bat b/libraries/StickyListHeaders/gradlew.bat
deleted file mode 100644
index aec99730b..000000000
--- a/libraries/StickyListHeaders/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/libraries/StickyListHeaders/library/build.gradle b/libraries/StickyListHeaders/library/build.gradle
index a15de94c2..21050fc98 100644
--- a/libraries/StickyListHeaders/library/build.gradle
+++ b/libraries/StickyListHeaders/library/build.gradle
@@ -12,5 +12,3 @@ android {
         }
     }
 }
-
-apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/eaa6b5404b7594e6c23b884fdc5795f545db55dd/gradle-mvn-push.gradle'
diff --git a/libraries/StickyListHeaders/sample/AndroidManifest.xml b/libraries/StickyListHeaders/sample/AndroidManifest.xml
deleted file mode 100644
index 4bf61a441..000000000
--- a/libraries/StickyListHeaders/sample/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.emilsjolander.stickylistheaders"
-    android:versionCode="2"
-    android:versionName="2.0">
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="18" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-        android:supportsRtl="true">
-        <activity
-            android:name=".TestActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/libs/android-support-v4.jar b/libraries/StickyListHeaders/sample/libs/android-support-v4.jar
deleted file mode 100644
index cf12d2839..000000000
--- a/libraries/StickyListHeaders/sample/libs/android-support-v4.jar
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_drawer.png b/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index 6614ea4f4..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_drawer.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_launcher.png b/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-ldpi/ic_launcher.png b/libraries/StickyListHeaders/sample/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 99238729d..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_drawer.png b/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index b05c026c1..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_drawer.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_launcher.png b/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_drawer.png b/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index bcf49dd73..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_drawer.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_launcher.png b/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/libraries/StickyListHeaders/sample/res/drawable/header_selector.xml b/libraries/StickyListHeaders/sample/res/drawable/header_selector.xml
deleted file mode 100644
index 5dfb8265c..000000000
--- a/libraries/StickyListHeaders/sample/res/drawable/header_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    
-    <item android:state_pressed="true" android:drawable="@color/header_pressed" />
-    <item android:drawable="@color/header_normal" />
-
-</selector>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/layout/header.xml b/libraries/StickyListHeaders/sample/res/layout/header.xml
deleted file mode 100644
index 177e40c4e..000000000
--- a/libraries/StickyListHeaders/sample/res/layout/header.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/header_selector" >
-
-    <se.emilsjolander.stickylistheaders.views.UnderlineTextView
-        android:id="@+id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|left"
-        android:padding="5dp"
-        android:textColor="@android:color/white"
-        android:textSize="17sp"
-        android:textStyle="bold" />
-
-</RelativeLayout>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/layout/list_footer.xml b/libraries/StickyListHeaders/sample/res/layout/list_footer.xml
deleted file mode 100644
index 4fa22c1f3..000000000
--- a/libraries/StickyListHeaders/sample/res/layout/list_footer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
-    <TextView android:text="@string/app_name"
-    android:layout_width="match_parent"
-    android:layout_height="700dip"
-    android:gravity="center"
-    android:layout_gravity="center"/>
-    
-
-</FrameLayout>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/layout/list_header.xml b/libraries/StickyListHeaders/sample/res/layout/list_header.xml
deleted file mode 100644
index 97d46c69b..000000000
--- a/libraries/StickyListHeaders/sample/res/layout/list_header.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
-    <TextView android:text="@string/app_name"
-    android:layout_width="match_parent"
-    android:layout_height="400dip"
-    android:gravity="center"
-    android:layout_gravity="center"/>
-    
-
-</FrameLayout>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/layout/main.xml b/libraries/StickyListHeaders/sample/res/layout/main.xml
deleted file mode 100644
index 2d22c3266..000000000
--- a/libraries/StickyListHeaders/sample/res/layout/main.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<android.support.v4.widget.DrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:drawSelectorOnTop="true"
-                android:padding="16dp"
-                android:scrollbarStyle="outsideOverlay"
-                android:fastScrollEnabled="true"/>
-
-        <TextView
-                android:id="@+id/empty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/empty"
-                android:textSize="30sp"
-                android:visibility="gone"/>
-
-    </FrameLayout>
-
-    <ScrollView
-            android:id="@+id/left_drawer"
-            android:layout_width="240dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:padding="5dp"
-            android:scrollbars="none"
-            android:clickable="true"
-            android:background="@android:color/white">
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-            <se.emilsjolander.stickylistheaders.views.UnderlineTextView
-                    style="@style/MenuSectionHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|left"
-                    android:text="@string/actions"
-                    android:textStyle="bold"/>
-
-            <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:gravity="left|center_vertical"
-                    android:text="@string/restore_list"
-                    android:id="@+id/restore_button"/>
-
-            <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:gravity="left|center_vertical"
-                    android:text="@string/update_list"
-                    android:id="@+id/update_button"/>
-
-            <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:gravity="left|center_vertical"
-                    android:id="@+id/clear_button"
-                    android:text="@string/clear_list"/>
-
-            <se.emilsjolander.stickylistheaders.views.UnderlineTextView
-                    style="@style/MenuSectionHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start|left"
-                    android:text="@string/options"
-                    android:textStyle="bold"/>
-
-            <CheckBox
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/sticky_header"
-                    android:id="@+id/sticky_checkBox"
-                    android:checked="true"/>
-
-            <CheckBox
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/fade_header"
-                    android:id="@+id/fade_checkBox"
-                    android:checked="true"/>
-
-            <CheckBox
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/draw_behind_header"
-                    android:id="@+id/draw_behind_checkBox"
-                    android:checked="true"/>
-
-            <CheckBox
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/fast_scroll"
-                android:id="@+id/fast_scroll_checkBox"
-                android:checked="true"/>
-        </LinearLayout>
-    </ScrollView>
-</android.support.v4.widget.DrawerLayout>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/layout/test_list_item_layout.xml b/libraries/StickyListHeaders/sample/res/layout/test_list_item_layout.xml
deleted file mode 100644
index 0f8efc32e..000000000
--- a/libraries/StickyListHeaders/sample/res/layout/test_list_item_layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:paddingBottom="20dp"
-    android:paddingTop="20dp" />
diff --git a/libraries/StickyListHeaders/sample/res/values/arrays.xml b/libraries/StickyListHeaders/sample/res/values/arrays.xml
deleted file mode 100755
index 5cd71de49..000000000
--- a/libraries/StickyListHeaders/sample/res/values/arrays.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    
-    <string-array name="countries">
-        
-        <item>Afghanistan</item>
-        <item>Albania</item>
-        <item>Algeria</item>
-        <item>Andorra</item>
-        <item>Angola</item>
-        <item>Antigua &amp; Barbuda</item>
-        <item>Argentina</item>
-        <item>Armenia</item>
-        <item>Australia</item>
-        <item>Austria</item>
-        <item>Azerbaijan</item>
-         
-        <item>Bahamas</item>
-        <item>Bahrain</item>
-        <item>Bangladesh</item>
-        <item>Barbados</item>
-        <item>Belarus</item>
-        <item>Belgium</item>
-        <item>Belize</item>
-        <item>Benin</item>
-        <item>Bhutan</item>
-        <item>Bolivia</item>
-        <item>Bosnia and Herzegovina</item>
-        <item>Botswana</item>
-        <item>Brazil</item>
-        <item>Brunei</item>
-        <item>Bulgaria</item>
-        <item>Burkina Faso</item>
-        <item>Burma</item>
-        <item>Burundi</item>
-        
-        <item>Cambodia</item>
-        <item>Cameroon</item>
-        <item>Canada</item>
-        <item>Cape Verde</item>
-        <item>Central African Republic</item>
-        <item>Chad</item>
-        <item>Chile</item>
-        <item>China</item>
-        <item>Colombia</item>
-        <item>Comoros</item>
-        <item>Congo, Democratic Republic of the</item>
-        <item>Congo, Republic of the</item>
-        <item>Costa Rica</item>
-        <item>Cote d\'voire</item>
-        <item>Croatia</item>
-        <item>Cuba</item>
-        <item>Cyprus</item>
-        <item>Czech Republic</item>
-        
-        <item>Denmark</item>
-        <item>Djibouti</item>
-        <item>Dominica</item>
-        <item>Dominican Republic</item>
-        
-        <item>Ecuador</item>
-        <item>Egypt</item>
-        <item>El Salvador</item>
-        <item>Equatorial Guinea</item>
-        <item>Eritrea</item>
-        <item>Estonia</item>
-        <item>Ethiopia</item>
-        
-        <item>Fiji</item>
-        <item>Finland</item>
-        <item>France</item>
-
-        <item>Gabon</item>
-        <item>Gambia, The</item>
-        <item>Georgia</item>
-        <item>Ghana</item>
-        <item>Greece</item>
-        <item>Grenada</item>
-        <item>Guatemala</item>
-        <item>Guinea</item>
-        <item>Guinea-Bissau</item>
-        <item>Guyana</item>
-        
-        <item>Haiti</item>
-        <item>Holy See</item>
-        <item>Honduras</item>
-        <item>Hong Kong</item>
-        <item>Hungary</item>
-        
-        <item>Iceland</item>
-        <item>India</item>
-        <item>Indonesia</item>
-        <item>Iran</item>
-        <item>Iraq</item>
-        <item>Ireland</item>
-        <item>Israel</item>
-        <item>Italy</item>
-        
-        <item>Jamaica</item>
-        <item>Japan</item>
-        <item>Jordan</item>
-        
-        <item>Kazakhstan</item>
-        <item>Kenya</item>
-        <item>Kiribati</item>
-        <item>Korea, North</item>
-        <item>Korea, South</item>
-        <item>Kosovo</item>
-        <item>Kuwait</item>
-        <item>Kyrgyzstan</item>
-        
-        <item>Laos</item>
-        <item>Latvia</item>
-        <item>Lebanon</item>
-        <item>Lesotho</item>
-        <item>Liberia</item>
-        <item>Libya</item>
-        <item>Liechtenstein</item>
-        <item>Lithuania</item>
-        <item>Luxembourg</item>
-        
-        <item>Macau</item>
-		<item>Macedonia</item>
-		<item>Madagascar</item>
-		<item>Malawi</item>
-		<item>Malaysia</item>
-		<item>Maldives</item>
-		<item>Mali</item>
-		<item>Malta</item>
-		<item>Marshall Islands</item>
-		<item>Mauritania</item>
-		<item>Mauritius</item>
-		<item>Mexico</item>
-		<item>Micronesia</item>
-		<item>Moldova</item>
-		<item>Monaco</item>
-		<item>Mongolia</item>
-		<item>Montenegro</item>
-		<item>Morocco</item>
-		<item>Mozambique</item>
-		
-        <item>Namibia</item>
-		<item>Nauru</item>
-		<item>Nepal</item>
-		<item>Netherlands</item>
-		<item>Netherlands Antilles</item>
-		<item>New Zealand</item>
-		<item>Nicaragua</item>
-		<item>Niger</item>
-		<item>Nigeria</item>
-		<item>North Korea</item>
-		<item>Norway</item>
-		
-        <item>Oman</item>
-        
-        <item>Pakistan</item>
-		<item>Palau</item>
-		<item>Palestinian Territories</item>
-		<item>Panama</item>
-		<item>Papua New Guinea</item>
-		<item>Paraguay</item>
-		<item>Peru</item>
-		<item>Philippines</item>
-		<item>Poland</item>
-		<item>Portugal</item>
-		
-        <item>Qatar</item>
-        
-        <item>Romania</item>
-        <item>Russia</item>
-        <item>Rwanda</item>
-        
-        <item>Saint Kitts and Nevis</item>
-		<item>Saint Lucia</item>
-		<item>Saint Vincent and the Grenadines</item>
-		<item>Samoa</item>
-		<item>San Marino</item>
-		<item>Sao Tome and Principe</item>
-		<item>Saudi Arabia</item>
-		<item>Senegal</item>
-		<item>Serbia</item>
-		<item>Seychelles</item>
-		<item>Sierra Leone</item>
-		<item>Singapore</item>
-		<item>Slovakia</item>
-		<item>Slovenia</item>
-		<item>Solomon Islands</item>
-		<item>Somalia</item>
-		<item>South Africa</item>
-		<item>South Korea</item>
-		<item>South Sudan</item>
-		<item>Spain</item>
-		<item>Sri Lanka</item>
-		<item>Sudan</item>
-		<item>Suriname</item>
-		<item>Swaziland</item>
-		<item>Sweden</item>
-		<item>Switzerland</item>
-		<item>Syria</item>
-
-        <item>Taiwan</item>
-        <item>Tajikistan</item>
-        <item>Tanzania</item>
-        <item>Thailand </item>
-        <item>Timor-Leste</item>
-        <item>Togo</item>
-        <item>Tonga</item>
-        <item>Trinidad and Tobago</item>
-        <item>Tunisia</item>
-        <item>Turkey</item>
-        <item>Turkmenistan</item>
-        <item>Tuvalu</item>
-        
-        <item>Uganda</item>
-        <item>Ukraine</item>
-        <item>United Arab Emirates</item>
-        <item>United Kingdom</item>
-        <item>Uruguay</item>
-        <item>Uzbekistan</item>
-        
-        <item>Vanuatu</item>
-        <item>Venezuela</item>
-        <item>Vietnam</item>
-        
-        <item>Yemen</item>
-        
-        <item>Zambia</item>
-        <item>Zimbabwe</item>
-    </string-array>
-</resources>
diff --git a/libraries/StickyListHeaders/sample/res/values/colors.xml b/libraries/StickyListHeaders/sample/res/values/colors.xml
deleted file mode 100644
index 601687e2e..000000000
--- a/libraries/StickyListHeaders/sample/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <color name="header_normal">#ffe74c3c</color>
-    <color name="header_pressed">#ffc0392b</color>
-    <color name="menu_section_header">#FFDDDDDD</color>
-
-</resources>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/values/strings.xml b/libraries/StickyListHeaders/sample/res/values/strings.xml
deleted file mode 100644
index 6beadbe75..000000000
--- a/libraries/StickyListHeaders/sample/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
-    <string name="app_name">StickyListHeaders Sample</string>
-    <string name="restore">Restore</string>
-    <string name="update">Update</string>
-    <string name="clear">Clear</string>
-    <string name="empty">Empty Adapter</string>
-    <string name="drawer_open">Drawer Open</string>
-    <string name="drawer_close">Drawer Close</string>
-    <string name="options">OPTIONS</string>
-    <string name="actions">ACTIONS</string>
-    <string name="restore_list">Restore list</string>
-    <string name="update_list">Update list</string>
-    <string name="clear_list">Clear list</string>
-    <string name="sticky_header">Sticky header</string>
-    <string name="fade_header">Fade header</string>
-    <string name="draw_behind_header">Draw behind header</string>
-    <string name="fast_scroll">Fast scroll</string>
-
-</resources>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/res/values/style.xml b/libraries/StickyListHeaders/sample/res/values/style.xml
deleted file mode 100644
index b34634b58..000000000
--- a/libraries/StickyListHeaders/sample/res/values/style.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MenuSectionHeader">
-        <item name="android:padding">5dp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/menu_section_header</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-</resources>
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestActivity.java b/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestActivity.java
deleted file mode 100644
index dc795ff4e..000000000
--- a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestActivity.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package se.emilsjolander.stickylistheaders;
-
-import android.annotation.TargetApi;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.*;
-
-/**
- * @author Emil Sjölander
- */
-public class TestActivity extends ActionBarActivity implements
-        AdapterView.OnItemClickListener, StickyListHeadersListView.OnHeaderClickListener,
-        StickyListHeadersListView.OnStickyHeaderOffsetChangedListener {
-
-    private TestBaseAdapter mAdapter;
-    private DrawerLayout mDrawerLayout;
-    private ActionBarDrawerToggle mDrawerToggle;
-    private boolean fadeHeader = true;
-
-    private StickyListHeadersListView stickyList;
-
-    private Button restoreButton;
-    private Button updateButton;
-    private Button clearButton;
-
-    private CheckBox stickyCheckBox;
-    private CheckBox fadeCheckBox;
-    private CheckBox drawBehindCheckBox;
-    private CheckBox fastScrollCheckBox;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        mAdapter = new TestBaseAdapter(this);
-
-        stickyList = (StickyListHeadersListView) findViewById(R.id.list);
-        stickyList.setOnItemClickListener(this);
-        stickyList.setOnHeaderClickListener(this);
-        stickyList.setOnStickyHeaderOffsetChangedListener(this);
-//		mStickyList.addHeaderView(inflater.inflate(R.layout.list_header, null));
-//		mStickyList.addFooterView(inflater.inflate(R.layout.list_footer, null));
-        stickyList.setEmptyView(findViewById(R.id.empty));
-        stickyList.setDrawingListUnderStickyHeader(true);
-        stickyList.setAreHeadersSticky(true);
-        stickyList.setAdapter(mAdapter);
-
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        mDrawerToggle = new ActionBarDrawerToggle(
-                this,                  /* host Activity */
-                mDrawerLayout,         /* DrawerLayout object */
-                R.drawable.ic_drawer,  /* nav drawer icon to replace 'Up' caret */
-                R.string.drawer_open,  /* "open drawer" description */
-                R.string.drawer_close  /* "close drawer" description */
-        );
-
-        // Set the drawer toggle as the DrawerListener
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
-
-        restoreButton = (Button) findViewById(R.id.restore_button);
-        restoreButton.setOnClickListener(buttonListener);
-        updateButton = (Button) findViewById(R.id.update_button);
-        updateButton.setOnClickListener(buttonListener);
-        clearButton = (Button) findViewById(R.id.clear_button);
-        clearButton.setOnClickListener(buttonListener);
-
-        stickyCheckBox = (CheckBox) findViewById(R.id.sticky_checkBox);
-        stickyCheckBox.setOnCheckedChangeListener(checkBoxListener);
-        fadeCheckBox = (CheckBox) findViewById(R.id.fade_checkBox);
-        fadeCheckBox.setOnCheckedChangeListener(checkBoxListener);
-        drawBehindCheckBox = (CheckBox) findViewById(R.id.draw_behind_checkBox);
-        drawBehindCheckBox.setOnCheckedChangeListener(checkBoxListener);
-        fastScrollCheckBox = (CheckBox) findViewById(R.id.fast_scroll_checkBox);
-        fastScrollCheckBox.setOnCheckedChangeListener(checkBoxListener);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    CompoundButton.OnCheckedChangeListener checkBoxListener = new CompoundButton.OnCheckedChangeListener() {
-
-        @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            switch (buttonView.getId()) {
-                case R.id.sticky_checkBox:
-                    stickyList.setAreHeadersSticky(isChecked);
-                    break;
-                case R.id.fade_checkBox:
-                    fadeHeader = isChecked;
-                    break;
-                case R.id.draw_behind_checkBox:
-                    stickyList.setDrawingListUnderStickyHeader(isChecked);
-                    break;
-                case R.id.fast_scroll_checkBox:
-                    stickyList.setFastScrollEnabled(isChecked);
-                    stickyList.setFastScrollAlwaysVisible(isChecked);
-                    break;
-            }
-        }
-    };
-
-    View.OnClickListener buttonListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.restore_button:
-                    mAdapter.restore();
-                    break;
-                case R.id.update_button:
-                    mAdapter.notifyDataSetChanged();
-                    break;
-                case R.id.clear_button:
-                    mAdapter.clear();
-                    break;
-            }
-        }
-    };
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position,
-                            long id) {
-        Toast.makeText(this, "Item " + position + " clicked!",
-                Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public void onHeaderClick(StickyListHeadersListView l, View header,
-                              int itemPosition, long headerId, boolean currentlySticky) {
-        Toast.makeText(this, "Header " + headerId + " currentlySticky ? " + currentlySticky,
-                Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public void onStickyHeaderOffsetChanged(StickyListHeadersListView l, View header, int offset) {
-        if (fadeHeader && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            header.setAlpha(1 - (offset / (float) header.getMeasuredHeight()));
-        }
-    }
-}
-\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestBaseAdapter.java b/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestBaseAdapter.java
deleted file mode 100644
index 777b7bd57..000000000
--- a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/TestBaseAdapter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package se.emilsjolander.stickylistheaders;
-
-import java.util.ArrayList;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.SectionIndexer;
-import android.widget.TextView;
-
-/**
- * @author Emil Sjölander
- */
-public class TestBaseAdapter extends BaseAdapter implements
-        StickyListHeadersAdapter, SectionIndexer {
-
-    private final Context mContext;
-    private String[] mCountries;
-    private int[] mSectionIndices;
-    private Character[] mSectionLetters;
-    private LayoutInflater mInflater;
-
-    public TestBaseAdapter(Context context) {
-        mContext = context;
-        mInflater = LayoutInflater.from(context);
-        mCountries = context.getResources().getStringArray(R.array.countries);
-        mSectionIndices = getSectionIndices();
-        mSectionLetters = getSectionLetters();
-    }
-
-    private int[] getSectionIndices() {
-        ArrayList<Integer> sectionIndices = new ArrayList<Integer>();
-        char lastFirstChar = mCountries[0].charAt(0);
-        sectionIndices.add(0);
-        for (int i = 1; i < mCountries.length; i++) {
-            if (mCountries[i].charAt(0) != lastFirstChar) {
-                lastFirstChar = mCountries[i].charAt(0);
-                sectionIndices.add(i);
-            }
-        }
-        int[] sections = new int[sectionIndices.size()];
-        for (int i = 0; i < sectionIndices.size(); i++) {
-            sections[i] = sectionIndices.get(i);
-        }
-        return sections;
-    }
-
-    private Character[] getSectionLetters() {
-        Character[] letters = new Character[mSectionIndices.length];
-        for (int i = 0; i < mSectionIndices.length; i++) {
-            letters[i] = mCountries[mSectionIndices[i]].charAt(0);
-        }
-        return letters;
-    }
-
-    @Override
-    public int getCount() {
-        return mCountries.length;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mCountries[position];
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder;
-
-        if (convertView == null) {
-            holder = new ViewHolder();
-            convertView = mInflater.inflate(R.layout.test_list_item_layout, parent, false);
-            holder.text = (TextView) convertView.findViewById(R.id.text);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        holder.text.setText(mCountries[position]);
-
-        return convertView;
-    }
-
-    @Override
-    public View getHeaderView(int position, View convertView, ViewGroup parent) {
-        HeaderViewHolder holder;
-
-        if (convertView == null) {
-            holder = new HeaderViewHolder();
-            convertView = mInflater.inflate(R.layout.header, parent, false);
-            holder.text = (TextView) convertView.findViewById(R.id.text1);
-            convertView.setTag(holder);
-        } else {
-            holder = (HeaderViewHolder) convertView.getTag();
-        }
-
-        // set header text as first char in name
-        CharSequence headerChar = mCountries[position].subSequence(0, 1);
-        holder.text.setText(headerChar);
-
-        return convertView;
-    }
-
-    /**
-     * Remember that these have to be static, postion=1 should always return
-     * the same Id that is.
-     */
-    @Override
-    public long getHeaderId(int position) {
-        // return the first character of the country as ID because this is what
-        // headers are based upon
-        return mCountries[position].subSequence(0, 1).charAt(0);
-    }
-
-    @Override
-    public int getPositionForSection(int section) {
-        if (section >= mSectionIndices.length) {
-            section = mSectionIndices.length - 1;
-        } else if (section < 0) {
-            section = 0;
-        }
-        return mSectionIndices[section];
-    }
-
-    @Override
-    public int getSectionForPosition(int position) {
-        for (int i = 0; i < mSectionIndices.length; i++) {
-            if (position < mSectionIndices[i]) {
-                return i - 1;
-            }
-        }
-        return mSectionIndices.length - 1;
-    }
-
-    @Override
-    public Object[] getSections() {
-        return mSectionLetters;
-    }
-
-    public void clear() {
-        mCountries = new String[0];
-        mSectionIndices = new int[0];
-        mSectionLetters = new Character[0];
-        notifyDataSetChanged();
-    }
-
-    public void restore() {
-        mCountries = mContext.getResources().getStringArray(R.array.countries);
-        mSectionIndices = getSectionIndices();
-        mSectionLetters = getSectionLetters();
-        notifyDataSetChanged();
-    }
-
-    class HeaderViewHolder {
-        TextView text;
-    }
-
-    class ViewHolder {
-        TextView text;
-    }
-
-}
diff --git a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java b/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java
deleted file mode 100644
index c202c00b8..000000000
--- a/libraries/StickyListHeaders/sample/src/se/emilsjolander/stickylistheaders/views/UnderlineTextView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package se.emilsjolander.stickylistheaders.views;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.widget.TextView;
-
-/**
- * @author Eric Frohnhoefer
- */
-public class UnderlineTextView  extends TextView {
-    private final Paint mPaint = new Paint();
-    private int mUnderlineHeight = 0;
-
-    public UnderlineTextView(Context context) {
-        this(context, null);
-    }
-
-    public UnderlineTextView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public UnderlineTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        init(context, attrs);
-    }
-
-    private void init(Context context, AttributeSet attrs) {
-        Resources r = getResources();
-        mUnderlineHeight = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, r.getDisplayMetrics());
-    }
-
-    @Override
-    public void setPadding(int left, int top, int right, int bottom) {
-        super.setPadding(left, top, right, bottom + mUnderlineHeight);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        // Draw the underline the same color as the text
-        mPaint.setColor(getTextColors().getDefaultColor());
-        canvas.drawRect(0, getHeight() - mUnderlineHeight, getWidth(), getHeight(), mPaint);
-    }
-}
diff --git a/libraries/StickyListHeaders/settings.gradle b/libraries/StickyListHeaders/settings.gradle
deleted file mode 100644
index 2c81ac7fd..000000000
--- a/libraries/StickyListHeaders/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include 'library'
-include 'sample'
diff --git a/libraries/zxing/AndroidManifest.xml b/libraries/zxing/AndroidManifest.xml
new file mode 100644
index 000000000..ef720bdb6
--- /dev/null
+++ b/libraries/zxing/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.zxing"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+</manifest>
+\ No newline at end of file
diff --git a/libraries/StickyListHeaders/sample/build.gradle b/libraries/zxing/build.gradle
index b620008e3..21050fc98 100644
--- a/libraries/StickyListHeaders/sample/build.gradle
+++ b/libraries/zxing/build.gradle
@@ -1,13 +1,4 @@
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compile project(':library')
-    compile 'com.android.support:appcompat-v7:19.0.+'
-    compile 'com.android.support:support-v4:19.0.0'
-}
+apply plugin: 'android-library'
 
 android {
     compileSdkVersion 19
diff --git a/libraries/StickyListHeaders/sample/project.properties b/libraries/zxing/project.properties
index a6cf15dae..91d2b0246 100644
--- a/libraries/StickyListHeaders/sample/project.properties
+++ b/libraries/zxing/project.properties
@@ -12,4 +12,4 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=../library
+android.library=true
diff --git a/OpenPGP-Keychain/src/com/google/zxing/BarcodeFormat.java b/libraries/zxing/src/com/google/zxing/BarcodeFormat.java
index 1e5d47958..1e5d47958 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/BarcodeFormat.java
+++ b/libraries/zxing/src/com/google/zxing/BarcodeFormat.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/Binarizer.java b/libraries/zxing/src/com/google/zxing/Binarizer.java
index 912a3b556..912a3b556 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/Binarizer.java
+++ b/libraries/zxing/src/com/google/zxing/Binarizer.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/BinaryBitmap.java b/libraries/zxing/src/com/google/zxing/BinaryBitmap.java
index b97e46705..b97e46705 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/BinaryBitmap.java
+++ b/libraries/zxing/src/com/google/zxing/BinaryBitmap.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/ChecksumException.java b/libraries/zxing/src/com/google/zxing/ChecksumException.java
index dedb4be99..dedb4be99 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/ChecksumException.java
+++ b/libraries/zxing/src/com/google/zxing/ChecksumException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/DecodeHintType.java b/libraries/zxing/src/com/google/zxing/DecodeHintType.java
index 20b922ca1..20b922ca1 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/DecodeHintType.java
+++ b/libraries/zxing/src/com/google/zxing/DecodeHintType.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/EncodeHintType.java b/libraries/zxing/src/com/google/zxing/EncodeHintType.java
index 35afc1530..35afc1530 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/EncodeHintType.java
+++ b/libraries/zxing/src/com/google/zxing/EncodeHintType.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/FormatException.java b/libraries/zxing/src/com/google/zxing/FormatException.java
index 6967e93de..6967e93de 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/FormatException.java
+++ b/libraries/zxing/src/com/google/zxing/FormatException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/LuminanceSource.java b/libraries/zxing/src/com/google/zxing/LuminanceSource.java
index 4b6d4539f..4b6d4539f 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/LuminanceSource.java
+++ b/libraries/zxing/src/com/google/zxing/LuminanceSource.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/NotFoundException.java b/libraries/zxing/src/com/google/zxing/NotFoundException.java
index dedab8dfc..dedab8dfc 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/NotFoundException.java
+++ b/libraries/zxing/src/com/google/zxing/NotFoundException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/Reader.java b/libraries/zxing/src/com/google/zxing/Reader.java
index 47e843ba6..47e843ba6 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/Reader.java
+++ b/libraries/zxing/src/com/google/zxing/Reader.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/ReaderException.java b/libraries/zxing/src/com/google/zxing/ReaderException.java
index 224a497e5..224a497e5 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/ReaderException.java
+++ b/libraries/zxing/src/com/google/zxing/ReaderException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/Result.java b/libraries/zxing/src/com/google/zxing/Result.java
index ee1af527e..ee1af527e 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/Result.java
+++ b/libraries/zxing/src/com/google/zxing/Result.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/ResultMetadataType.java b/libraries/zxing/src/com/google/zxing/ResultMetadataType.java
index 33d69d9c5..33d69d9c5 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/ResultMetadataType.java
+++ b/libraries/zxing/src/com/google/zxing/ResultMetadataType.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/ResultPoint.java b/libraries/zxing/src/com/google/zxing/ResultPoint.java
index 366ae3855..366ae3855 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/ResultPoint.java
+++ b/libraries/zxing/src/com/google/zxing/ResultPoint.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/ResultPointCallback.java b/libraries/zxing/src/com/google/zxing/ResultPointCallback.java
index 0c85410bc..0c85410bc 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/ResultPointCallback.java
+++ b/libraries/zxing/src/com/google/zxing/ResultPointCallback.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/Writer.java b/libraries/zxing/src/com/google/zxing/Writer.java
index 6474ca7e2..6474ca7e2 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/Writer.java
+++ b/libraries/zxing/src/com/google/zxing/Writer.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/WriterException.java b/libraries/zxing/src/com/google/zxing/WriterException.java
index 0c19af01d..0c19af01d 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/WriterException.java
+++ b/libraries/zxing/src/com/google/zxing/WriterException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/BitArray.java b/libraries/zxing/src/com/google/zxing/common/BitArray.java
index 6eb0d57c6..6eb0d57c6 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/BitArray.java
+++ b/libraries/zxing/src/com/google/zxing/common/BitArray.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/BitMatrix.java b/libraries/zxing/src/com/google/zxing/common/BitMatrix.java
index 8bf75b289..8bf75b289 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/BitMatrix.java
+++ b/libraries/zxing/src/com/google/zxing/common/BitMatrix.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/BitSource.java b/libraries/zxing/src/com/google/zxing/common/BitSource.java
index a61ac5105..a61ac5105 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/BitSource.java
+++ b/libraries/zxing/src/com/google/zxing/common/BitSource.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/CharacterSetECI.java b/libraries/zxing/src/com/google/zxing/common/CharacterSetECI.java
index 42b7fa9f6..42b7fa9f6 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/CharacterSetECI.java
+++ b/libraries/zxing/src/com/google/zxing/common/CharacterSetECI.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/Collections.java b/libraries/zxing/src/com/google/zxing/common/Collections.java
index 319ebfe6d..319ebfe6d 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/Collections.java
+++ b/libraries/zxing/src/com/google/zxing/common/Collections.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/Comparator.java b/libraries/zxing/src/com/google/zxing/common/Comparator.java
index e1be15e31..e1be15e31 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/Comparator.java
+++ b/libraries/zxing/src/com/google/zxing/common/Comparator.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/DecoderResult.java b/libraries/zxing/src/com/google/zxing/common/DecoderResult.java
index 7e0855333..7e0855333 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/DecoderResult.java
+++ b/libraries/zxing/src/com/google/zxing/common/DecoderResult.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/DefaultGridSampler.java b/libraries/zxing/src/com/google/zxing/common/DefaultGridSampler.java
index 74c9e7c6b..74c9e7c6b 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/DefaultGridSampler.java
+++ b/libraries/zxing/src/com/google/zxing/common/DefaultGridSampler.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/DetectorResult.java b/libraries/zxing/src/com/google/zxing/common/DetectorResult.java
index ea4794d17..ea4794d17 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/DetectorResult.java
+++ b/libraries/zxing/src/com/google/zxing/common/DetectorResult.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/ECI.java b/libraries/zxing/src/com/google/zxing/common/ECI.java
index 444c779c2..444c779c2 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/ECI.java
+++ b/libraries/zxing/src/com/google/zxing/common/ECI.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/GlobalHistogramBinarizer.java b/libraries/zxing/src/com/google/zxing/common/GlobalHistogramBinarizer.java
index 4fa2a887b..4fa2a887b 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/GlobalHistogramBinarizer.java
+++ b/libraries/zxing/src/com/google/zxing/common/GlobalHistogramBinarizer.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/GridSampler.java b/libraries/zxing/src/com/google/zxing/common/GridSampler.java
index 7f26c264e..7f26c264e 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/GridSampler.java
+++ b/libraries/zxing/src/com/google/zxing/common/GridSampler.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/HybridBinarizer.java b/libraries/zxing/src/com/google/zxing/common/HybridBinarizer.java
index b482c1a22..b482c1a22 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/HybridBinarizer.java
+++ b/libraries/zxing/src/com/google/zxing/common/HybridBinarizer.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/PerspectiveTransform.java b/libraries/zxing/src/com/google/zxing/common/PerspectiveTransform.java
index 9e65baff1..9e65baff1 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/PerspectiveTransform.java
+++ b/libraries/zxing/src/com/google/zxing/common/PerspectiveTransform.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/StringUtils.java b/libraries/zxing/src/com/google/zxing/common/StringUtils.java
index 97999f997..97999f997 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/StringUtils.java
+++ b/libraries/zxing/src/com/google/zxing/common/StringUtils.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java b/libraries/zxing/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java
index 950a22364..950a22364 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java
+++ b/libraries/zxing/src/com/google/zxing/common/detector/MonochromeRectangleDetector.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/detector/WhiteRectangleDetector.java b/libraries/zxing/src/com/google/zxing/common/detector/WhiteRectangleDetector.java
index 31d87e9d0..31d87e9d0 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/detector/WhiteRectangleDetector.java
+++ b/libraries/zxing/src/com/google/zxing/common/detector/WhiteRectangleDetector.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/GenericGF.java b/libraries/zxing/src/com/google/zxing/common/reedsolomon/GenericGF.java
index 859c379ee..859c379ee 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/GenericGF.java
+++ b/libraries/zxing/src/com/google/zxing/common/reedsolomon/GenericGF.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/GenericGFPoly.java b/libraries/zxing/src/com/google/zxing/common/reedsolomon/GenericGFPoly.java
index 056802287..056802287 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/GenericGFPoly.java
+++ b/libraries/zxing/src/com/google/zxing/common/reedsolomon/GenericGFPoly.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoder.java b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoder.java
index b523fd34b..b523fd34b 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoder.java
+++ b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonDecoder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
index 05e2ae03a..05e2ae03a 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
+++ b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java
index d5b45a612..d5b45a612 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java
+++ b/libraries/zxing/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/multi/ByQuadrantReader.java b/libraries/zxing/src/com/google/zxing/multi/ByQuadrantReader.java
index 35904d364..35904d364 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/multi/ByQuadrantReader.java
+++ b/libraries/zxing/src/com/google/zxing/multi/ByQuadrantReader.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/multi/GenericMultipleBarcodeReader.java b/libraries/zxing/src/com/google/zxing/multi/GenericMultipleBarcodeReader.java
index 70d454251..70d454251 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/multi/GenericMultipleBarcodeReader.java
+++ b/libraries/zxing/src/com/google/zxing/multi/GenericMultipleBarcodeReader.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/multi/MultipleBarcodeReader.java b/libraries/zxing/src/com/google/zxing/multi/MultipleBarcodeReader.java
index 5f0c7eb5d..5f0c7eb5d 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/multi/MultipleBarcodeReader.java
+++ b/libraries/zxing/src/com/google/zxing/multi/MultipleBarcodeReader.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/multi/qrcode/detector/MultiDetector.java b/libraries/zxing/src/com/google/zxing/multi/qrcode/detector/MultiDetector.java
index 584c41404..584c41404 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/multi/qrcode/detector/MultiDetector.java
+++ b/libraries/zxing/src/com/google/zxing/multi/qrcode/detector/MultiDetector.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java b/libraries/zxing/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
index 1162324e2..1162324e2 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
+++ b/libraries/zxing/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/QRCodeWriter.java b/libraries/zxing/src/com/google/zxing/qrcode/QRCodeWriter.java
index fff4f5d1e..fff4f5d1e 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/QRCodeWriter.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java
index 9d131a554..9d131a554 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DataBlock.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DataBlock.java
index 12959d9c1..12959d9c1 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DataBlock.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DataBlock.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DataMask.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DataMask.java
index d29dbd47f..d29dbd47f 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DataMask.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DataMask.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
index ff374ac50..ff374ac50 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
index e8d6c2589..e8d6c2589 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/FormatInformation.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/FormatInformation.java
index 1b76b0de5..1b76b0de5 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/FormatInformation.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/FormatInformation.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/Mode.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/Mode.java
index 3c66217d3..3c66217d3 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/Mode.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/Mode.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/Version.java b/libraries/zxing/src/com/google/zxing/qrcode/decoder/Version.java
index ba795de42..ba795de42 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/decoder/Version.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/decoder/Version.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/AlignmentPattern.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/AlignmentPattern.java
index 6fc1a2c88..6fc1a2c88 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/AlignmentPattern.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/AlignmentPattern.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/AlignmentPatternFinder.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/AlignmentPatternFinder.java
index 3aadf284f..3aadf284f 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/AlignmentPatternFinder.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/AlignmentPatternFinder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/Detector.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/Detector.java
index 724d39d59..724d39d59 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/Detector.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/Detector.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPattern.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPattern.java
index 7a9914d76..7a9914d76 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPattern.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPattern.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
index 01b3bde2a..01b3bde2a 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPatternInfo.java b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPatternInfo.java
index 3c3401085..3c3401085 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/detector/FinderPatternInfo.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/detector/FinderPatternInfo.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/BlockPair.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/BlockPair.java
index 5714d9c3a..5714d9c3a 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/BlockPair.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/BlockPair.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/ByteMatrix.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/ByteMatrix.java
index eb248a26c..eb248a26c 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/ByteMatrix.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/ByteMatrix.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/Encoder.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/Encoder.java
index 8796511ab..8796511ab 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/Encoder.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/Encoder.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/MaskUtil.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/MaskUtil.java
index 61ccf48c1..61ccf48c1 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/MaskUtil.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/MaskUtil.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/MatrixUtil.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
index 3d434e675..3d434e675 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
diff --git a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/QRCode.java b/libraries/zxing/src/com/google/zxing/qrcode/encoder/QRCode.java
index 05c818513..05c818513 100644
--- a/OpenPGP-Keychain/src/com/google/zxing/qrcode/encoder/QRCode.java
+++ b/libraries/zxing/src/com/google/zxing/qrcode/encoder/QRCode.java
diff --git a/settings.gradle b/settings.gradle
index 3cb8012d3..4dc9b38ab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,3 +2,4 @@ include ':OpenPGP-Keychain'
 include ':libraries:ActionBarSherlock'
 include ':libraries:HtmlTextView'
 include ':libraries:StickyListHeaders:library'
+include ':libraries:zxing'