Merge branch 'master' of gitlab.com:fdroid/fdroiddata

Conflicts:
	metadata/com.haha01haha01.harail.txt

metadata/com.SecUpwN.AIMSICD.txt

@@ -1,4 +1,4 @@
-Categories:Security
+Categories:Security,System,Connectivity
 License:GPLv3+
 Web Site:https://secupwn.github.io/Android-IMSI-Catcher-Detector
 Source Code:https://github.com/SecUpwN/Android-IMSI-Catcher-Detector
@@ -7,10 +7,11 @@ Changelog:https://github.com/SecUpwN/Android-IMSI-Catcher-Detector/blob/HEAD/CHA
 Donate:https://www.bountysource.com/teams/android-imsi-catcher-detector/issues
 
 Auto Name:Android IMSI-Catcher Detector
-Summary:Detect and avoid fake base stations
+Summary:Fight cellular network attacks
 Description:
-Detect fake base stations (IMSI-Catchers) in GSM/UMTS Networks. Please visit the
-website for detailed information.
+Detect attacks of fake base stations such as IMSI-Catcher and StingRay on your
+GSM/UMTS network. Look for silent SMS used by police and intelligence services.
+Join us on GitHub!
 .
 
 Repo Type:git

metadata/com.haha01haha01.harail.txt

@@ -41,7 +41,7 @@ Build:1.2,3
     commit=1.2
     submodules=yes
     extlibs=commons-net/commons-net-3.0.1.jar,android/android-support-v4.jar
-    target=android-22
+    target=android-23
     buildjni=yes
 
 Auto Update Mode:Version %v

metadata/de.ph1b.audiobook.txt

@@ -247,7 +247,7 @@ Build:2.4.3,83
     forceversion=yes
     prebuild=sed -i -e '/applicationVariants.all/i/*' -e '/dependencies {/i*/\n\n}\n' build.gradle
 
-Build:2.4.3.2,8
+Build:2.4.3.2,85
     commit=v2.4.3.2
     subdir=audiobook
     gradle=yes

metadata/eu.siacs.conversations.txt

@@ -544,7 +544,7 @@ Build:1.7.3,107
 Build:1.8.0,109
     commit=1.8.0
     gradle=yes
-    prebuild=sed -i -e '/applicationVariants/i/*' -e '/lintOptions {/i*/' build.gradle
+    prebuild=sed -i -e '/applicationVariants/i/*' -e '/lintOptions {/i*/' -e '/maven {/,+2d' build.gradle
 
 Maintainer Notes:
 Build succeeds now, but fdroid strips a line required for output variants.

metadata/eu.veldsoft.colors.overflow.txt

@@ -0,0 +1,42 @@
+AntiFeatures:Ads
+Categories:Games
+License:GPLv3
+Web Site:
+Source Code:https://github.com/TodorBalabanov/ColorsOverflow
+Issue Tracker:https://github.com/TodorBalabanov/ColorsOverflow/issues
+
+Auto Name:Colors Overflow
+Summary:Puzzle game
+Description:
+It is a strategic game on a board divided in 8 x 8 cells. Each cell may contain
+a piece of size one, two or three. Initially each player has three pieces in
+size two. The players take turns to select one of their own pieces to be
+increased one in size. If a size three piece is selected, it will "overflow",
+which means that it will be split into four small pieces, which are then
+distributed to the neighbor cells (left, right,up, down). If a neighbor is also
+a size three piece, it will also "overflow". Thus you can get rather long chain
+reactions.
+
+The opponents pieces can only be taken by "overflowing" your own pieces into
+them. If one of your pieces is distributed to a cell occupied by one of the
+opponent's pieces, that piece changes color and is increased by one in size.
+That way you can win an entire chain of the opponent's pieces in one move, if
+you play wisely. Pieces that falls off the edge of the board are lost. Don't
+worry too much about this though, the game is not about having many pieces, just
+about having ALL the pieces ;-)
+
+The winner in the game is the player who captures all the pieces on the board.
+Although the rules are very simple, the game is not easy to play at all. There
+are a lot of tips and tricks to learn.
+.
+
+Repo Type:git
+Repo:https://github.com/TodorBalabanov/ColorsOverflow
+
+Build:1.0,1
+    commit=d883da8108eec6af7f806a7c6c67900344d25811
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1

metadata/net.bitplane.android.microphone.txt

@@ -0,0 +1,27 @@
+Categories:Multimedia
+License:MIT
+Web Site:http://bitplane.net/projects/android/microphone/
+Source Code:https://github.com/bitplane/Microphone
+Issue Tracker:https://github.com/bitplane/Microphone/issues
+
+Auto Name:Microphone
+Summary:Feeds audio from the mic right out of the speaker
+Description:
+This microphone just feeds audio from the phone's mic right out of its speaker,
+which means you get a horrible screeching feedback noise.
+
+However, plug the thing into your computer with a male to male headphone jack
+and your phone becomes a PC mic.
+.
+
+Repo Type:git
+Repo:https://github.com/bitplane/Microphone
+
+Build:0.7,7
+    commit=c5462023
+    target=android-4
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.7
+Current Version Code:7