Merge branch 'master' into 'master'

Bug fixes Password Store

Version 1.1-b5, contains some important bug fixes

See merge request !267

metadata/com.zeapo.pwdstore.txt

@@ -49,6 +49,24 @@ Build:1.1-b4,9
         sed -i -e '/clinker/d' -e '/repositories/amavenCentral\(\)' build.gradle && \
         sed -i -e '518d' src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java 
         
+Build:1.1-b5,11
+    commit=3764db17c9e6bf229bd404080abf86743bba4a8e
+    subdir=app
+    submodules=yes
+    gradle=yes
+    srclibs=Swipelist@de441bf662770acf64df9051727aa5dcd159a16d
+    prebuild=cp -fR $$Swipelist$$/swipelistview/src/main ../libraries/swipelistview && pushd ../libraries/swipelistview/ && \
+        mv java src && mkdir libs && android update lib-project -p . --target "android-19" && \
+        echo "android.library=true" >> project.properties && \
+        cp ../openpgp-api-lib/build.gradle ./ && \
+        echo -e 'repositories {\nmavenCentral()\n}\n\ndependencies {\ncompile "com.nineoldandroids:library:2.4.0+"\ncompile "com.android.support:appcompat-v7:19.0.+"\n}' >> build.gradle && \
+        popd && \
+        echo "include ':libraries:swipelistview'" >> ../settings.gradle && \
+        sed -i -e '30,32d' build.gradle && \
+        sed -i -e "/libraries:openpgp-api-lib/acompile project\(':libraries:swipelistview'\)" build.gradle && \
+        sed -i -e '/clinker/d' -e '/repositories/amavenCentral\(\)' build.gradle && \
+        sed -i -e '518d' src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java        
+
 Maintainer Notes:
 Upstream is clean and should build without modifications when swipelistview is
 deployed to jcenter/central.
@@ -56,6 +74,6 @@ deployed to jcenter/central.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.1-b4
-Current Version Code:9
+Current Version:1.1-b5
+Current Version Code:11