diff --git a/.gitignore b/.gitignore
index b5f6f562a3..5d211be3a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,14 @@
-config.py
-repo/
-archive/
-logs/
-built/
-tmp/
-builder/
+/config.py
+/repo/
+/archive/
+/logs/
+/built/
+/tmp/
+/builder/
 *~
 *.pyc
-unsigned/
-note
-misc/
-shmetadata/
-shmextlib/
+/unsigned/
+/note
+/misc/
+/shmetadata/
+/shmextlib/
diff --git a/build/.gitignore b/build/.gitignore
index f6fa15fee1..fd81615271 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,3 +1,3 @@
-*/
-!extlib/
-.fdroidvcs-*
+/*/
+!/extlib/
+/.fdroidvcs-*
diff --git a/build/extlib/android/android-support-v4.jar b/build/extlib/android/android-support-v4.jar
index cf12d2839d..9056828a04 100644
Binary files a/build/extlib/android/android-support-v4.jar and b/build/extlib/android/android-support-v4.jar differ
diff --git a/build/extlib/android/android-support-v4r18.jar b/build/extlib/android/android-support-v4r18.jar
new file mode 100644
index 0000000000..cf12d2839d
Binary files /dev/null and b/build/extlib/android/android-support-v4r18.jar differ
diff --git a/build/extlib/android/support-v4-md5.txt b/build/extlib/android/support-v4-md5.txt
index 09783d076e..f125549ffa 100644
--- a/build/extlib/android/support-v4-md5.txt
+++ b/build/extlib/android/support-v4-md5.txt
@@ -1,3 +1,4 @@
+8ec28ddd6c1b954bfa1fa54c5df54eba  r19
 ed257a47cae11af1a55614055b879947  r18
 7c357558b1ef5cd16f1d312fe87c38a0  r11
 7b5efe58fd28cbc7fa8f9e88ab9c7d65  r11
diff --git a/build/extlib/cooper.ic_launcher.png b/build/extlib/cooper.ic_launcher.png
new file mode 100644
index 0000000000..26bc3be4d3
Binary files /dev/null and b/build/extlib/cooper.ic_launcher.png differ
diff --git a/build/extlib/jackson/jackson-annotations-2.1.0.jar b/build/extlib/jackson/jackson-annotations-2.1.0.jar
new file mode 100644
index 0000000000..e4ca559718
Binary files /dev/null and b/build/extlib/jackson/jackson-annotations-2.1.0.jar differ
diff --git a/build/extlib/jackson/jackson-core-2.1.0.jar b/build/extlib/jackson/jackson-core-2.1.0.jar
new file mode 100644
index 0000000000..6899eda27a
Binary files /dev/null and b/build/extlib/jackson/jackson-core-2.1.0.jar differ
diff --git a/build/extlib/jackson/jackson-databind-2.1.0.jar b/build/extlib/jackson/jackson-databind-2.1.0.jar
new file mode 100644
index 0000000000..5eceb00756
Binary files /dev/null and b/build/extlib/jackson/jackson-databind-2.1.0.jar differ
diff --git a/build/extlib/jmdns-build.xml b/build/extlib/jmdns-build.xml
new file mode 100644
index 0000000000..762f07a591
--- /dev/null
+++ b/build/extlib/jmdns-build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="jmdns" default="jar" basedir=".">
+
+    <target name="compile" description="Compile source">
+        <mkdir dir="bin" />
+	<javac srcdir="javax" includes="**" destdir="bin" />
+    </target>
+
+    <target name="jar" description="Package into JAR" depends="compile">
+        <jar destfile="jmdns.jar" basedir="bin" compress="true" />
+    </target>
+</project>
diff --git a/build/extlib/libgdx/libgdx-0.9.8.zip b/build/extlib/libgdx/libgdx-0.9.8.zip
new file mode 100644
index 0000000000..3efd824956
Binary files /dev/null and b/build/extlib/libgdx/libgdx-0.9.8.zip differ
diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt
index 91040f83a7..41207a3608 100644
--- a/metadata/An.stop.txt
+++ b/metadata/An.stop.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://code.google.com/p/anstop/
-Source Code:http://code.google.com/p/anstop/source/checkout
-Issue Tracker:http://code.google.com/p/anstop/issues/list
+Source Code:http://code.google.com/p/anstop/source
+Issue Tracker:http://code.google.com/p/anstop/issues
 
 Auto Name:Anstop
 Summary:A simple stopwatch
diff --git a/metadata/SpeedoMeterApp.main.txt b/metadata/SpeedoMeterApp.main.txt
index 6ad5b4f293..d7b218393e 100644
--- a/metadata/SpeedoMeterApp.main.txt
+++ b/metadata/SpeedoMeterApp.main.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Public Domain
 Web Site:http://sourceforge.net/projects/androidspeedo/
 Source Code:http://sourceforge.net/projects/androidspeedo/
diff --git a/metadata/a2dp.Vol.txt b/metadata/a2dp.Vol.txt
index da276763e6..fde35297b2 100644
--- a/metadata/a2dp.Vol.txt
+++ b/metadata/a2dp.Vol.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/a2dpvolume/
-Source Code:http://code.google.com/p/a2dpvolume/source/checkout
-Issue Tracker:http://code.google.com/p/a2dpvolume/issues/list
+Source Code:http://code.google.com/p/a2dpvolume/source
+Issue Tracker:http://code.google.com/p/a2dpvolume/issues
 
 Auto Name:A2DP Volume
 Summary:Manage Bluetooth functions
@@ -24,15 +24,41 @@ understands GPS data.
 Repo Type:hg
 Repo:http://code.google.com/p/a2dpvolume/
 
-Build Version:2.8.11,93,8eac7d
-Build Version:2.8.14,96,317d1cdf584a
-Build Version:2.8.17,99,89248bd5da61
-Build Version:2.9.1,101,!remove because beta feebcb632fe9
-Build Version:2.9.4,104,8a57089be290
-Build Version:2.9.7,107,fec56a293772
+Build:2.8.11,93
+    commit=8eac7d
+
+Build:2.8.14,96
+    commit=317d1cdf584a
+
+Build:2.8.17,99
+    commit=89248bd5da61
+
+Build:2.9.1,101
+    disable=remove because beta 
+    commit=feebcb632fe9
+
+Build:2.9.4,104
+    commit=8a57089be290
+
+Build:2.9.7,107
+    commit=fec56a293772
+
+Build:2.10.1,111
+    commit=f4c887a2b798
+
+Build:2.11.1,114
+    commit=cb4c113f9280
+
+Build:2.11.7,120
+    extlibs=android/android-support-v4.jar
+    commit=7b3166a47356
+
+Maintainer Notes:
+No tags.
+.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.10.1
-Current Version Code:111
+Current Version:2.11.7
+Current Version Code:120
 
diff --git a/metadata/aarddict.android.txt b/metadata/aarddict.android.txt
index 038b490084..d8d8fd6f6c 100644
--- a/metadata/aarddict.android.txt
+++ b/metadata/aarddict.android.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://aarddict.org/android/
 Source Code:https://github.com/aarddict/android
@@ -22,18 +22,48 @@ on the website.
 Repo Type:git
 Repo:git://github.com/aarddict/android.git
 
-Build Version:1.3.1,10,1.3.1,prebuild=mv lib libs
-Build Version:1.4.0,12,7df930161256324e31b2c720281629f58446b6d6,prebuild=mv lib libs
-Build Version:1.4.1,13,b81c9c8c52de5f65b550e3c608a610962582e5cd,prebuild=mv lib libs
-Build Version:1.6.1,16,1.6.1,target=android-17
-Build Version:1.6.2,17,1.6.2,target=android-17
-Build Version:1.6.3,18,1.6.3,target=android-17
-Build Version:1.6.4,19,1.6.4,target=android-17
-Build Version:1.6.5,20,1.6.5,target=android-17
-Build Version:1.6.6,21,1.6.6,target=android-17
+Build:1.3.1,10
+    commit=1.3.1
+    prebuild=mv lib libs
+
+Build:1.4.0,12
+    commit=7df930161256324e31b2c720281629f58446b6d6
+    prebuild=mv lib libs
+
+Build:1.4.1,13
+    commit=b81c9c8c52de5f65b550e3c608a610962582e5cd
+    prebuild=mv lib libs
+
+Build:1.6.1,16
+    commit=1.6.1
+    target=android-17
+
+Build:1.6.2,17
+    commit=1.6.2
+    target=android-17
+
+Build:1.6.3,18
+    commit=1.6.3
+    target=android-17
+
+Build:1.6.4,19
+    commit=1.6.4
+    target=android-17
+
+Build:1.6.5,20
+    commit=1.6.5
+    target=android-17
+
+Build:1.6.6,21
+    commit=1.6.6
+    target=android-17
+
+Build:1.6.7,22
+    commit=1.6.7
+    target=android-17
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.6.6
-Current Version Code:21
+Current Version:1.6.7
+Current Version Code:22
 
diff --git a/metadata/acr.browser.barebones.txt b/metadata/acr.browser.barebones.txt
index 23b735eb2d..3a3532855a 100644
--- a/metadata/acr.browser.barebones.txt
+++ b/metadata/acr.browser.barebones.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/anthonycr/Lightning-Browser
 Source Code:https://github.com/anthonycr/Lightning-Browser
@@ -17,27 +17,43 @@ Description:
 Repo Type:git
 Repo:https://github.com/anthonycr/Lightning-Browser.git
 
-Build Version:2.2.0,22,7a228d2a8c1,target=android-17,prebuild=\
-sed -i 's/int MAX_TABS=5\, MAX_BOOKMARKS=5/int MAX_TABS=15\, MAX_BOOKMARKS=50/g' \
-src/acr/browser/barebones/Barebones.java
-Build Version:2.3.4,27,2afff6d2876,target=android-17,prebuild=\
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
-src/acr/browser/barebones/Barebones.java
-Build Version:2.3.7,30,bba148f92e1,target=android-17,prebuild=\
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
-src/acr/browser/barebones/Barebones.java
-Build Version:2.3.12,36,d99e82b6cbbe8,target=android-17,prebuild=\
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
-src/acr/browser/barebones/Barebones.java
-Build Version:2.4,37,deed4b7f3c487102,target=android-17,prebuild=\
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
-src/acr/browser/barebones/Barebones.java
-Build Version:2.4.3,42,103b4e40e113beaf,target=android-17,prebuild=\
-sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' \
-src/acr/browser/barebones/Barebones.java
+Build:2.2.0,22
+    commit=7a228d2a8c1
+    target=android-17
+    prebuild=sed -i 's/int MAX_TABS=5, MAX_BOOKMARKS=5/int MAX_TABS=15, MAX_BOOKMARKS=50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.3.4,27
+    commit=2afff6d2876
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.3.7,30
+    commit=bba148f92e1
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.3.12,36
+    commit=d99e82b6cbbe8
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.4,37
+    commit=deed4b7f3c487102
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.4.3,42
+    commit=103b4e40e113beaf
+    target=android-17
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/g;s/MAX_BOOKMARKS = 5/MAX_BOOKMARKS = 50/g' src/acr/browser/barebones/Barebones.java
+
+Build:2.5.1.4,60
+    commit=a383f8e77871
+    target=android-18
+    prebuild=sed -i 's/MAX_TABS = 5/MAX_TABS = 15/' src/acr/browser/barebones/utilities/FinalVariables.java
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.4.3
-Current Version Code:42
+Current Version:2.5.1.4
+Current Version Code:60
 
diff --git a/metadata/am.ed.importcontacts.txt b/metadata/am.ed.importcontacts.txt
index ec5e564840..3c8d913c0c 100644
--- a/metadata/am.ed.importcontacts.txt
+++ b/metadata/am.ed.importcontacts.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://ed.am/dev/android/import-contacts
 Source Code:http://bzr.ed.am/android/import-contacts
@@ -22,7 +22,7 @@ Build Version:1.3.1,10301,1.3.1
 Build Version:1.3.3,10303,1.3.3
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.3.3
 Current Version Code:10303
 
diff --git a/metadata/android.androidVNC.txt b/metadata/android.androidVNC.txt
index 6897664115..6ab6380e0a 100644
--- a/metadata/android.androidVNC.txt
+++ b/metadata/android.androidVNC.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv2+
 Web Site:http://code.google.com/p/android-vnc-viewer/
-Source Code:http://code.google.com/p/android-vnc-viewer/source/checkout
-Issue Tracker:http://code.google.com/p/android-vnc-viewer/issues/list
+Source Code:http://code.google.com/p/android-vnc-viewer/source
+Issue Tracker:http://code.google.com/p/android-vnc-viewer/issues
 
 Auto Name:androidVNC
 Summary:VNC (remote desktop) viewer
@@ -16,8 +16,7 @@ Repo:http://android-vnc-viewer.googlecode.com/svn/branches/antlersoft
 Build Version:0.5.0,13,197,subdir=androidVNC
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5.0
 Current Version Code:13
 
diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt
index 58c3200f52..bf2c3ab82d 100644
--- a/metadata/android.game.prboom.txt
+++ b/metadata/android.game.prboom.txt
@@ -1,15 +1,16 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/prboom4android/
-Source Code:http://code.google.com/p/prboom4android/source/list
-Issue Tracker:http://code.google.com/p/prboom4android/issues/list
+Source Code:http://code.google.com/p/prboom4android/source
+Issue Tracker:http://code.google.com/p/prboom4android/issues
 
 Auto Name:PrBoom For Android
 Summary:PrBoom Doom game engine
 Description:
-PrBoom4Android is a port of the open source PrBoom Doom engine.
+PrBoom4Android is a port of the PrBoom Doom engine.
+
 It was originally ported to Android by Vladimir Silva when the
-first android device, the G1, was released. Since the original
+first Android device, the G1, was released. Since the original
 port was designed to work with the G1's hardware keyboard, it
 did not function with touchscreen only devices. This release
 adds on-screen multitouch controls to support newer devices.
diff --git a/metadata/android.tether.txt b/metadata/android.tether.txt
index c59ead84d1..afa3b5cffa 100644
--- a/metadata/android.tether.txt
+++ b/metadata/android.tether.txt
@@ -1,9 +1,9 @@
 Disabled:Prebuilts
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/android-wifi-tether/
-Source Code:https://code.google.com/p/android-wifi-tether/source/list
-Issue Tracker:https://code.google.com/p/android-wifi-tether/issues/list
+Source Code:https://code.google.com/p/android-wifi-tether/source
+Issue Tracker:https://code.google.com/p/android-wifi-tether/issues
 Donate:https://code.google.com/p/android-wifi-tether/
 
 Auto Name:WiFi Tether
@@ -27,7 +27,7 @@ ad-hoc mode) and (probably) a custom-kernel which supports netfilter
 
 Requires Root:Yes
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 
 Build Version:2.0.7,26,523,buildjni=yes
diff --git a/metadata/app.openconnect.txt b/metadata/app.openconnect.txt
new file mode 100644
index 0000000000..1521b364d6
--- /dev/null
+++ b/metadata/app.openconnect.txt
@@ -0,0 +1,42 @@
+Categories:Internet
+License:GPLv2+
+Web Site:
+Source Code:https://github.com/cernekee/ics-openconnect
+Issue Tracker:https://github.com/cernekee/ics-openconnect/issues
+
+Auto Name:OpenConnect
+Summary:SSL VPN client for Cisco AnyConnect
+Description:
+OpenConnect for Android is an SSL VPN client used with Cisco AnyConnect or
+ocserv based gateways.
+
+Features:
+
+* One-click connection (batch mode)
+* Supports RSA SecurID and TOTP software tokens
+* Keepalive feature to prevent unnecessary disconnections
+* Compatible with ARMv7, x86, and MIPS devices
+* No root required
+* Based on the popular [http://www.infradead.org/openconnect/ OpenConnect Linux package]
+
+Requirements:
+
+* Android 4.0 (ICS) or higher
+* An account on a suitable VPN server
+.
+
+Repo Type:git
+Repo:git://github.com/cernekee/ics-openconnect
+
+Build:0.1,1
+    commit=v0.1
+    submodules=yes
+    prebuild=rm -rf assets/raw/{armeabi,x86,mips} libs/*.jar && \
+        make -C external/openconnect/android sources
+    build=make -C external NDK=$$NDK$$
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.5.40
+Current Version Code:72
+
diff --git a/metadata/apps.babycaretimer.txt b/metadata/apps.babycaretimer.txt
index 0e5068bf54..7374235b01 100644
--- a/metadata/apps.babycaretimer.txt
+++ b/metadata/apps.babycaretimer.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/baby-care-timer
-Source Code:http://code.google.com/p/baby-care-timer/source/list
-Issue Tracker:http://code.google.com/p/baby-care-timer/issues/list
+Source Code:http://code.google.com/p/baby-care-timer/source
+Issue Tracker:http://code.google.com/p/baby-care-timer/issues
 Donate:http://code.google.com/p/baby-care-timer
 
 Auto Name:Baby Care Timer
@@ -14,11 +14,15 @@ Baby Care Timer is a timer for parents to track feedings, diaper changes and oth
 Repo Type:git-svn
 Repo:http://baby-care-timer.googlecode.com/svn/trunk/
 
-Build Version:1.4,5,133
+Build:1.4,5
+    commit=133
+
+Build:1.5,6
+    commit=135
+	target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.4
-Current Version Code:5
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:6
 
diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 6c70dd9b22..0dea3d4684 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -1,9 +1,9 @@
 AntiFeatures:NonFreeAdd
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/droid-notify/
-Source Code:https://code.google.com/p/droid-notify/source/list
-Issue Tracker:https://code.google.com/p/droid-notify/issues/list
+Source Code:https://code.google.com/p/droid-notify/source
+Issue Tracker:https://code.google.com/p/droid-notify/issues
 
 Auto Name:Notify Lite
 Summary:Notification management tool
@@ -19,7 +19,7 @@ install the fully-featured proprietary version.
 Status: Newer versions have been published by the author but without source code.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://droid-notify.googlecode.com/svn/trunk
 
 Build Version:2.20,27,707,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
diff --git a/metadata/arity.calculator.txt b/metadata/arity.calculator.txt
index 2a4531960e..d4d7da4e34 100644
--- a/metadata/arity.calculator.txt
+++ b/metadata/arity.calculator.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/arity-calculator
-Source Code:http://code.google.com/p/arity-calculator/source/list
-Issue Tracker:http://code.google.com/p/arity-calculator/issues/list
+Source Code:http://code.google.com/p/arity-calculator/source
+Issue Tracker:http://code.google.com/p/arity-calculator/issues
 
 Auto Name:Arity
 Summary:Scientific calculator
diff --git a/metadata/at.bitfire.davdroid.txt b/metadata/at.bitfire.davdroid.txt
index fc99e1086d..949d3b3021 100644
--- a/metadata/at.bitfire.davdroid.txt
+++ b/metadata/at.bitfire.davdroid.txt
@@ -1,30 +1,82 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://davdroid.bitfire.at/
 Source Code:https://github.com/rfc2822/davdroid
 Issue Tracker:https://github.com/rfc2822/davdroid/issues
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ZT8F5NRCBDB2C&no_note=0&no_shipping=1&currency_code=EUR&item_name=DAVdroid+donation
+Donate:http://davdroid.bitfire.at/donate
+FlattrID:2100160
 Bitcoin:1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
 
 Auto Name:DAVdroid
 Summary:Contacts and Calendar sync
 Description:
-DAVdroid is a CalDAV/CardDAV synchronisation provider for Android 4+ devices.
+DAVdroid is a CalDAV/CardDAV synchronisation adapter for Android 4+ devices.
 Use it with your own server (like Radicale or DAViCal) or with a trusted
-hoster to keep your contacts and events under your control.
+hoster to keep your contacts and events under your control. Integrates
+natively in Android calendar/contact apps.
 
-After installing the app, add a DAVdroid account using Settings/Account.
+[https://github.com/rfc2822/davdroid/releases/ Changelog]
 .
 
 Repo Type:git
 Repo:https://github.com/rfc2822/davdroid.git
 
-Build Version:0.3.2-alpha,5,v0.3.2-alpha
-Build Version:0.3.3-alpha,6,v0.3.3-alpha
-Build Version:0.3.4-alpha,7,v0.3.4-alpha
+Build:0.3.2-alpha,5
+    commit=v0.3.2-alpha
 
-Auto Update Mode:None
+Build:0.3.3-alpha,6
+    commit=v0.3.3-alpha
+
+Build:0.3.4-alpha,7
+    commit=v0.3.4-alpha
+
+Build:0.3.5-alpha,8
+    commit=v0.3.5-alpha
+
+Build:0.3.6-alpha,10
+    commit=v0.3.6-alpha
+
+Build:0.3.7-alpha,11
+    commit=v0.3.7-alpha
+
+Build:0.3.8-alpha,12
+    commit=v0.3.8-alpha
+
+Build:0.4-alpha,13
+    commit=v0.4-alpha
+
+Build:0.4.1-alpha,14
+    commit=v0.4.1-alpha
+
+Build:0.4.2-alpha,15
+    commit=v0.4.2-alpha
+
+Build:0.4.3-alpha,16
+    commit=v0.4.3-alpha
+
+Build:0.4.4-alpha,17
+    commit=v0.4.4-alpha
+
+Build:0.5-alpha,18
+    commit=v0.5-alpha
+
+Build:0.5.1-alpha,19
+    commit=v0.5.1-alpha
+
+Build:0.5.2-alpha,20
+    commit=v0.5.2-alpha
+
+Build:0.5.3-alpha,21
+    commit=v0.5.3-alpha
+
+Build:0.5.4-alpha,22
+    commit=v0.5.4-alpha
+
+Build:0.5.6-alpha,24
+    commit=v0.5.6-alpha
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.3.4-alpha
-Current Version Code:7
+Current Version:0.5.6-alpha
+Current Version Code:24
 
diff --git a/metadata/at.bitfire.gfxtablet.txt b/metadata/at.bitfire.gfxtablet.txt
index 7b48ff77f0..3eb0972ead 100644
--- a/metadata/at.bitfire.gfxtablet.txt
+++ b/metadata/at.bitfire.gfxtablet.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:http://rfc2822.github.com/GfxTablet/
 Source Code:https://github.com/rfc2822/GfxTablet
diff --git a/metadata/at.dasz.KolabDroid.txt b/metadata/at.dasz.KolabDroid.txt
index e05c816a9c..c567bd9eca 100644
--- a/metadata/at.dasz.KolabDroid.txt
+++ b/metadata/at.dasz.KolabDroid.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/kolab-android
 Source Code:https://gitorious.org/kolab-android/kolab-android
-Issue Tracker:http://code.google.com/p/kolab-android/issues/list
+Issue Tracker:http://code.google.com/p/kolab-android/issues
 
 Name:Kolab Client
 Auto Name:Kolab Client for Android
diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index e4dd97403f..8008d45c62 100644
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -1,10 +1,9 @@
-AntiFeatures:Tracking
-Category:Office
+AntiFeatures:Tracking,UpstreamNonFree
+Categories:Office
 License:GPLv3+
 Web Site:http://reader.tomtasche.at
 Source Code:https://github.com/TomTasche/OpenDocument.droid
 Issue Tracker:https://github.com/TomTasche/OpenDocument.droid/issues
-# http://forum.xda-developers.com/donatetome.php?u=2074207
 FlattrID:117140
 
 Auto Name:OpenDocument Reader
@@ -17,85 +16,142 @@ including OpenOffice and LibreOffice.
 Anti-feature: Tracking. A recent version had code for sending
 some device info via HTTP POST to a appspot.com server.
 
-A proprietary ad library was removed before building.
+A proprietary ad library was removed before building. More recent versions
+have several more proprietary binaries.
 .
 
 Repo Type:git
 Repo:https://github.com/TomTasche/OpenDocument.droid.git
 
-Build Version:1.1.9,11,243eba4f441b3601de96
-Build Version:1.2,12,d174bed05a6026ddb5db
-Build Version:1.2.3,15,8fe022fd67e5bb62c6d8
-Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
-Build Version:1.3.2,24,4bcf9024ac9fb96bc5c03c3129f9d401272caaf0,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm libs/jopendocument.jar && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
-Build Version:2.0.6,33,!unknown build server problems b88d8bf6d,srclibs=\
-BillingLibrary@3ecc7cad9c;MobAdMob@2d5736;FilePicker@d12f209e8;aFileChooser@c3197bb151,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$aFileChooser$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$FilePicker$$@' project.properties && \
-echo "android.library.reference.3=$$BillingLibrary$$" >> project.properties && \
-echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \
-cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
-rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
+Build:1.1.9,11
+    commit=243eba4f441b3601de96
+
+Build:1.2,12
+    commit=d174bed05a6026ddb5db
+
+Build:1.2.3,15
+    commit=8fe022fd67e5bb62c6d8
+
+Build:1.3.0,22
+    commit=4b8ea7438125e90d43bdadfc042723a7a485a217
+    srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2
+    prebuild=rm *.apk && \
+        cp -r $$JOpenDocument$$/src/* src/ && \
+        rm -rf src/test/
+
+Build:1.3.2,24
+    commit=4bcf9024ac9fb96bc5c03c3129f9d401272caaf0
+    srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2
+    prebuild=rm *.apk && \
+        rm libs/jopendocument.jar && \
+        cp -r $$JOpenDocument$$/src/* src/ && \
+        rm -rf src/test/
+
+Build:2.0.6,33
+    disable=!unknown build server problems b88d8bf6d
+    commit=unknown - see disabled
+    srclibs=BillingLibrary@3ecc7cad9c;MobAdMob@2d5736;FilePicker@d12f209e8;aFileChooser@c3197bb151
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$aFileChooser$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$FilePicker$$@' project.properties && \
+        echo "android.library.reference.3=$$BillingLibrary$$" >> project.properties && \
+        echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \
+        cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
+
 #careful deleting lines in submodule source: they don't reappear
-Build Version:2.0.7,34,771437a702,init=\
-git config -f .gitmodules --remove-section submodule.test && \
-git rm --cached test && rm -rf test && \
-sed -i 's/git@github.com:/https:\/\/github.com\//g' .gitmodules && \
-sed -i 's/git@github.com:/https:\/\/github.com\//g' .git/config && git submodule update --init,\
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
-sed -i '42d' filepicker-android/src/io/filepicker/AuthActivity.java && \
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
-Build Version:2.0.8,35,!broken v2.0.8,submodules=no,init=\
-rm -rf odf2html/.gitmodules odf2html/library/dep/commons && git submodule update --init && \
-git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
-cd odf2html/ && git checkout 008034b70714,\
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk \
-libs/android-support-v4.jar odf2html/library/odf2html.jar && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/,\
-build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
-mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
-cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
-Build Version:2.0.8.2,37,!broken v2.0.8.2,submodules=no,init=\
-rm -rf $(find . -name bin) && rm -rf $(find . -name gen) && \
-rm -rf odf2html/.gitmodules odf2html/library/dep/commons && git submodule update --init && \
-git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
-cd odf2html/library/dep/commons && git checkout f9ba1a9,\
-srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
-AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
-echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
-rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk \
-libs/android-support-v4.jar odf2html/library/odf2html.jar && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
-cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/,\
-build=cd odf2html/library/ && ant -f dep/commons/library/build.xml && \
-mkdir -p lib/ && mv dep/commons/library/commons.jar lib/ && \
-cp lib/commons.jar ../../libs/ && ant && mv odf2html.jar ../../libs/
-Build Version:2.10.1,45,!won't build and probably crashy at v2.10.1,submodules=yes,init=\
-rm -rf $(find . -name bin) && rm -rf $(find . -name gen) && cd odf2html/library/dep && \
-rm -rf commons && git clone git://github.com/andiwand/commons.git && \
-cd commons/ && git checkout cf34f179f,srclibs=MobAdMob@2d5736;NoAnalytics@533c6c1,\
-update=.;aFileChooser/aFileChooser;ActionBarSherlock/actionbarsherlock;\
-Android-RateThisApp/library;Android-AppMsg/library;pay-me/library,prebuild=\
-echo -e "android.library.reference.6=$$MobAdMob$$\n\
-android.library.reference.7=$$NoAnalytics$$" >> project.properties && \
-sed -i 's/1.6/1.7/g' odf2html/library/build.xml && \
-sed -i 's/1.6/1.7/g' odf2html/library/dep/commons/library/build.xml && \
-rm -rf libs/GoogleAdMobAdsSdk*.jar libs/libGoogleAnalytics*.jar OpenDocument.apk \
-libs/android-support-v4.jar,build=cd odf2html/library/dep/commons/library && \
-ant && cd ../../../ && ant && mv dep/commons/library/commons.jar \
-../../libs/ && mv odf2html.jar ../../libs/
+Build:2.0.7,34
+    commit=771437a702
+    init=git config -f .gitmodules --remove-section submodule.test && \
+        git rm --cached test && \
+        rm -rf test && \
+        sed -i 's/git@github.com:/https:\/\/github.com\//g' .gitmodules && \
+        sed -i 's/git@github.com:/https:\/\/github.com\//g' .git/config && \
+        git submodule update --init
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
+    srclibs=MobAdMob@2d5736
+    prebuild=sed -i '42d' filepicker-android/src/io/filepicker/AuthActivity.java && \
+        echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
+
+Build:2.0.8,35
+    disable=!broken v2.0.8
+    commit=unknown - see disabled
+    submodules=no
+    init=rm -rf odf2html/.gitmodules odf2html/library/dep/commons && \
+        git submodule update --init && \
+        git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
+        cd odf2html/ && \
+        git checkout 008034b70714
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar odf2html/library/odf2html.jar && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
+    build=cd odf2html/library/ && \
+        ant -f dep/commons/library/build.xml && \
+        mkdir -p lib/ && \
+        mv dep/commons/library/commons.jar lib/ && \
+        cp lib/commons.jar ../../libs/ && \
+        ant && \
+        mv odf2html.jar ../../libs/
+
+Build:2.0.8.2,37
+    disable=!broken v2.0.8.2
+    commit=unknown - see disabled
+    submodules=no
+    init=rm -rf $(find . -name bin) && \
+        rm -rf $(find . -name gen) && \
+        rm -rf odf2html/.gitmodules odf2html/library/dep/commons && \
+        git submodule update --init && \
+        git clone git://github.com/andiwand/commons.git odf2html/library/dep/commons && \
+        cd odf2html/library/dep/commons && \
+        git checkout f9ba1a9
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar odf2html/library/odf2html.jar && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
+        cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
+    build=cd odf2html/library/ && \
+        ant -f dep/commons/library/build.xml && \
+        mkdir -p lib/ && \
+        mv dep/commons/library/commons.jar lib/ && \
+        cp lib/commons.jar ../../libs/ && \
+        ant && \
+        mv odf2html.jar ../../libs/
+
+Build:2.10.1,45
+    disable=!won't build and probably crashy at v2.10.1
+    commit=v2.10.1
+    submodules=yes
+    init=rm -rf $(find . -name bin) && \
+        rm -rf $(find . -name gen) && \
+        cd odf2html/library/dep && \
+        rm -rf commons && \
+        git clone git://github.com/andiwand/commons.git && \
+        cd commons/ && \
+        git checkout cf34f179f
+    update=.;aFileChooser/aFileChooser;ActionBarSherlock/actionbarsherlock;Android-RateThisApp/library;Android-AppMsg/library;pay-me/library
+    srclibs=MobAdMob@2d5736;NoAnalytics@533c6c1
+    prebuild=echo -e "android.library.reference.6=$$MobAdMob$$\nandroid.library.reference.7=$$NoAnalytics$$" >> project.properties && \
+        sed -i 's/1.6/1.7/g' odf2html/library/build.xml && \
+        sed -i 's/1.6/1.7/g' odf2html/library/dep/commons/library/build.xml && \
+        rm -rf libs/GoogleAdMobAdsSdk*.jar libs/libGoogleAnalytics*.jar OpenDocument.apk libs/android-support-v4.jar
+    build=cd odf2html/library/dep/commons/library && \
+        ant && \
+        cd ../../../ && \
+        ant && \
+        mv dep/commons/library/commons.jar ../../libs/ && \
+        mv odf2html.jar ../../libs/
+
+Build:2.12.6,59
+    disable=mutiple proprietary libraries (at least 3)
 
 Auto Update Mode:None
-# Device-variable; don't want to nuke submodules with Tags
-Update Check Mode:RepoManifest
-Current Version:2.12.4
-Current Version Code:57
+Update Check Mode:Static
+Current Version:2.12.6
+Current Version Code:59
 
diff --git a/metadata/at.univie.sensorium.txt b/metadata/at.univie.sensorium.txt
index 39efc826a6..4b1451d59a 100644
--- a/metadata/at.univie.sensorium.txt
+++ b/metadata/at.univie.sensorium.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:
 Source Code:https://github.com/fmetzger/android-sensorium
diff --git a/metadata/au.com.darkside.XServer.txt b/metadata/au.com.darkside.XServer.txt
index 1922a86af0..f56e9167ce 100644
--- a/metadata/au.com.darkside.XServer.txt
+++ b/metadata/au.com.darkside.XServer.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:http://my20percent.wordpress.com/2012/02/27/android-x-server
-Source Code:http://code.google.com/p/android-xserver/source/checkout
-Issue Tracker:http://code.google.com/p/android-xserver/issues/list
+Source Code:http://code.google.com/p/android-xserver/source
+Issue Tracker:http://code.google.com/p/android-xserver/issues
 
 Auto Name:X Server
 Summary:Display remote X11 apps
@@ -16,17 +16,51 @@ use graphical apps according to the instructions on
 Repo Type:git
 Repo:https://code.google.com/p/android-xserver/
 
-Build Version:1.02,2,5811ae984ea0,subdir=XServer
-Build Version:1.09,9,26105231ccb8,subdir=XServer
-Build Version:1.10,10,91d1a1cd52d6,subdir=XServer
-Build Version:1.11,11,f3a6f53541c3,subdir=XServer
-Build Version:1.12,12,3df512591de2,subdir=XServer
-Build Version:1.13,13,9b3adb042a42,subdir=XServer
-Build Version:1.14,14,c5d01152c7bc,subdir=XServer
+Build:1.02,2
+    commit=5811ae984ea0
+    subdir=XServer
+
+Build:1.09,9
+    commit=26105231ccb8
+    subdir=XServer
+
+Build:1.10,10
+    commit=91d1a1cd52d6
+    subdir=XServer
+
+Build:1.11,11
+    commit=f3a6f53541c3
+    subdir=XServer
+
+Build:1.12,12
+    commit=3df512591de2
+    subdir=XServer
+
+Build:1.13,13
+    commit=9b3adb042a42
+    subdir=XServer
+
+Build:1.14,14
+    commit=c5d01152c7bc
+    subdir=XServer
+
+Build:1.15,15
+    commit=b252b1054e6e
+    subdir=XServer
+    target=android-10
+
+Build:1.16,16
+    commit=172b334c5d45
+    subdir=XServer
+    target=android-10
+
+Build:1.17,17
+    commit=971671bddd46
+    subdir=XServer
+    target=android-19
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.14
-Current Version Code:14
+Update Check Mode:RepoManifest
+Current Version:1.17
+Current Version Code:17
 
diff --git a/metadata/aws.apps.androidDrawables.txt b/metadata/aws.apps.androidDrawables.txt
index 2f25f3df3b..4dc6fff0a0 100644
--- a/metadata/aws.apps.androidDrawables.txt
+++ b/metadata/aws.apps.androidDrawables.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://aschillings.co.uk/html/android_resource_viewer.html
 Source Code:https://github.com/alt236/Android-Drawables---Android
diff --git a/metadata/aws.apps.usbDeviceEnumerator.txt b/metadata/aws.apps.usbDeviceEnumerator.txt
index fbf81fbccd..b1fb54ff6a 100644
--- a/metadata/aws.apps.usbDeviceEnumerator.txt
+++ b/metadata/aws.apps.usbDeviceEnumerator.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://aschillings.co.uk/html/usb_device_info.html
 Source Code:https://github.com/alt236/USB-Device-Info---Android
@@ -16,8 +16,7 @@ Repo:https://github.com/alt236/USB-Device-Info---Android.git
 Build Version:0.0.5,5,v0.0.5
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.0.5
 Current Version Code:5
 
diff --git a/metadata/bander.notepad.txt b/metadata/bander.notepad.txt
index 67c779bc18..64306a3328 100644
--- a/metadata/bander.notepad.txt
+++ b/metadata/bander.notepad.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/banderlabs/
-Source Code:http://code.google.com/p/banderlabs/source/checkout
-Issue Tracker:http://code.google.com/p/banderlabs/issues/list
+Source Code:http://code.google.com/p/banderlabs/source
+Issue Tracker:http://code.google.com/p/banderlabs/issues
 
 Auto Name:Notepad
 Summary:Basic note taking
@@ -11,14 +11,12 @@ It has selectable text size, searching, sorting, and the ability to send notes.
 .
 
 Repo Type:git-svn
-Repo:http://banderlabs.googlecode.com/svn/trunk/
+Repo:http://banderlabs.googlecode.com/svn/trunk/Notepad
 
-Build Version:1.06,12,77,subdir=Notepad,target=android-15,prebuild=\
-rm -rf ../FileMan/ ../TaskMan/ ../MuClient/
+Build Version:1.06,12,77,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.06
 Current Version Code:12
 
diff --git a/metadata/be.norio.randomapp.txt b/metadata/be.norio.randomapp.txt
new file mode 100644
index 0000000000..0a468edc90
--- /dev/null
+++ b/metadata/be.norio.randomapp.txt
@@ -0,0 +1,23 @@
+Categories:System
+License:GPLv3
+Web Site:
+Source Code:https://github.com/litrik/be.norio.randomapp
+Issue Tracker:https://github.com/litrik/be.norio.randomapp/issues
+
+Auto Name:Random App
+Summary:Launch a random app
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/litrik/be.norio.randomapp.git
+
+Build:1.0,1
+    commit=0ac31
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/be.ppareit.swiftp_free.txt b/metadata/be.ppareit.swiftp_free.txt
index e785fa6c38..90172eaeda 100644
--- a/metadata/be.ppareit.swiftp_free.txt
+++ b/metadata/be.ppareit.swiftp_free.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://ppareit.github.com/swiftp
 Source Code:https://github.com/ppareit/swiftp
diff --git a/metadata/be.quentinloos.manille.txt b/metadata/be.quentinloos.manille.txt
index 403b78f5c4..8d8fb9d4c9 100644
--- a/metadata/be.quentinloos.manille.txt
+++ b/metadata/be.quentinloos.manille.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://quentinloos.be/projets/manille
 Source Code:https://github.com/Kent1/Manille
@@ -16,17 +16,20 @@ application deviendra indispensable chez tous les passionnés de manille.
 Repo Type:git
 Repo:https://github.com/Kent1/Manille.git
 
-#Build Version:1.0,1,c995252ee8d927e16827d73f6b3f2002906d4f2b,gradle=yes
-Build Version:1.0,1,c995252ee8d92,subdir=src/main,\
+Build Version:1.0,1,!remove patched ant build at c995252ee8d92,subdir=src/main,\
 srclibs=Support-v7@android-4.3_r2.1,\
 target=android-18,\
 prebuild=echo 'android.library.reference.1=$$Support-v7$$' >> project.properties && \
          mv ../../libs/android-support-v4.jar $$Support-v7$$/libs/  && \
          echo 'source.dir=java' > ant.properties
 
+Build:1.1,2
+	commit=v1.1
+	forceversion=yes
+	forcevercode=yes
+	gradle=yes
+
 
-# error on build server with gradle
-#Auto Update Mode:Version v%v
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.0
diff --git a/metadata/biz.codefuture.svgviewer.txt b/metadata/biz.codefuture.svgviewer.txt
index a64ef7a5b9..309a928ca0 100644
--- a/metadata/biz.codefuture.svgviewer.txt
+++ b/metadata/biz.codefuture.svgviewer.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:
 Source Code:https://github.com/cw/svg-viewer-android
diff --git a/metadata/biz.gyrus.yaab.txt b/metadata/biz.gyrus.yaab.txt
index 7b6315106c..452c4b61c0 100644
--- a/metadata/biz.gyrus.yaab.txt
+++ b/metadata/biz.gyrus.yaab.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:https://bitbucket.org/gyrussolutions/yaab/wiki/Home
 Source Code:https://bitbucket.org/gyrussolutions/yaab/src
@@ -20,15 +20,39 @@ behind the operation.
 Repo Type:hg
 Repo:https://bitbucket.org/gyrussolutions/yaab
 
-Build Version:1.6.2,10,6def1b3
-Build Version:1.6.3,11,release1.6.3,target=android-16
-Build Version:1.9,14,release1.9,target=android-16
-Build Version:1.9.3,17,release1.9.3,target=android-17
-Build Version:1.9.5,19,release1.9.5,init=rm -rf bin gen
-Build Version:1.9.6,20,release1.9.6
+Build:1.6.2,10
+    commit=6def1b3
+
+Build:1.6.3,11
+    commit=release1.6.3
+    target=android-16
+
+Build:1.9,14
+    commit=release1.9
+    target=android-16
+
+Build:1.9.3,17
+    commit=release1.9.3
+    target=android-17
+
+Build:1.9.5,19
+    commit=release1.9.5
+    init=rm -rf bin gen
+
+Build:1.9.6,20
+    commit=release1.9.6
+
+Build:1.9.7,21
+    commit=release1.9.7
+
+Build:1.9.8,22
+    commit=release1.9.8
+
+Build:1.9.9,23
+    commit=release1.9.9
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.9.7
-Current Version Code:21
+Current Version:1.9.9
+Current Version Code:23
 
diff --git a/metadata/budo.budoist.txt b/metadata/budo.budoist.txt
index 963e81af07..b272140fd8 100644
--- a/metadata/budo.budoist.txt
+++ b/metadata/budo.budoist.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/budowski/budoist/
 Source Code:https://github.com/budowski/budoist
@@ -36,11 +36,10 @@ rm -f tree-view-list-android/build.xml && $$SDK$$/tools/android update project -
 Build Version:1.3.0,31,430a8cf,rm=BudoistRelease.apk,prebuild=\
 rm -f tree-view-list-android/build.xml && $$SDK$$/tools/android update project -p . --subprojects
 Build Version:1.3.1,32,v1.3.1,rm=BudoistRelease.apk,init=rm -f tree-view-list-android/build.xml
-Build Version:1.3.2,33,v1.3.2,rm=BudoistRelease.apk,init=rm -f tree-view-list-android/build.xml
+Build Version:1.3.2,33,v1.3.2,init=rm -f tree-view-list-android/build.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.3.2
 Current Version Code:33
 
diff --git a/metadata/buet.rafi.dictionary.txt b/metadata/buet.rafi.dictionary.txt
new file mode 100644
index 0000000000..b3be276af4
--- /dev/null
+++ b/metadata/buet.rafi.dictionary.txt
@@ -0,0 +1,29 @@
+Categories:Office
+License:GPLv2
+Web Site:
+Source Code:https://github.com/rafi-kamal/Bangla-Dictionary
+Issue Tracker:https://github.com/rafi-kamal/Bangla-Dictionary/issues
+
+Auto Name:Ridmik Dictionary
+Summary:English-Bengali Dictionary
+Description:
+Based on ankur.org's database. More info
+[http://www.bengalinux.org/english-to-bengali-dictionary/about.htm here].
+.
+
+Repo Type:git
+Repo:https://github.com/rafi-kamal/Bangla-Dictionary.git
+
+# use target to avoid build-tools bug if necessary
+Build:2.3,5
+    commit=05901
+
+Maintainer Notes:
+source for database is there
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.3
+Current Version Code:5
+
diff --git a/metadata/bughunter2.smsfilter.txt b/metadata/bughunter2.smsfilter.txt
index 16d8662155..d0f052e261 100644
--- a/metadata/bughunter2.smsfilter.txt
+++ b/metadata/bughunter2.smsfilter.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:Fair License
 Web Site:http://purl.org/net/smsfilter
 Source Code:http://purl.org/net/smsfilter
@@ -26,10 +26,16 @@ preference.
 Repo Type:git
 Repo:git://gitorious.org/sms-filter/sms-filter.git
 
-Build Version:1.0,1,bd53e27d8571d025cb51241761ce480359ec1153,target=android-8
+Build:1.0,1
+    commit=bd53e27d8571d025cb51241761ce480359ec1153
+    target=android-8
+
+Build:1.1,2
+    commit=c44a961eaa0fb39ff0028212fb2794b16c4ee1e3
+    target=android-8
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:1
+Current Version:1.1
+Current Version Code:2
 
diff --git a/metadata/ca.ddaly.android.heart.txt b/metadata/ca.ddaly.android.heart.txt
new file mode 100644
index 0000000000..92e3e2fe43
--- /dev/null
+++ b/metadata/ca.ddaly.android.heart.txt
@@ -0,0 +1,27 @@
+Categories:Office
+License:GPLv3
+Web Site:https://daryldy.github.com/Heart
+Source Code:https://github.com/daryldy/Heart
+Issue Tracker:https://github.com/daryldy/Heart/issues
+
+Auto Name:Heart Observe
+Summary:Track pulse and blood pressure
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/daryldy/Heart.git
+
+Build:1.1,3
+    commit=v1.1
+    rm=custom_rules.xml
+    srclibs=2:NumberPicker-SimonVT@1da4372;1:ActionBarSherlock@4.4.0
+    prebuild=mv misc/reText/help.txt assets/misc/help.html && \
+        mv misc/reText/about.txt assets/misc/about.html
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:3
+
diff --git a/metadata/caldwell.ben.bites.txt b/metadata/caldwell.ben.bites.txt
index f6ef9e55bf..39658cfef3 100644
--- a/metadata/caldwell.ben.bites.txt
+++ b/metadata/caldwell.ben.bites.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bites-android/
-Source Code:http://code.google.com/p/bites-android/source/checkout
-Issue Tracker:http://code.google.com/p/bites-android/issues/list
+Source Code:http://code.google.com/p/bites-android/source
+Issue Tracker:http://code.google.com/p/bites-android/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=XP4HTVTDCZPSN&lc=AU&item_name=Android%20Application%20Development&item_number=Bites
 
 Auto Name:Bites
@@ -22,8 +22,7 @@ Build Version:1.3,4,241,prebuild=mkdir -p src/org/openintents/ && cd src/org/ope
 svn co -r4000 http://openintents.googlecode.com/svn/trunk/shoppinglist/ShoppingList/src/org/openintents/intents
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3
 Current Version Code:4
 
diff --git a/metadata/caldwell.ben.trolly.txt b/metadata/caldwell.ben.trolly.txt
index a325ba9ea5..b7309a8cb9 100644
--- a/metadata/caldwell.ben.trolly.txt
+++ b/metadata/caldwell.ben.trolly.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://sites.google.com/site/caldwellcode/
-Source Code:http://code.google.com/p/trolly/source/checkout
-Issue Tracker:http://code.google.com/p/trolly/issues/list
+Source Code:http://code.google.com/p/trolly/source
+Issue Tracker:http://code.google.com/p/trolly/issues
 
 Auto Name:Trolly
 Summary:Shopping list application
@@ -12,15 +12,18 @@ app with no annoying or complicated features. It exposes intent filters to
 allow other apps to automatically add items to the shopping list.
 .
 
-Repo Type:svn
-Repo:http://trolly.googlecode.com/svn/trunk
+Repo Type:git-svn
+Repo:http://trolly.googlecode.com/svn;trunk=trunk;tags=tags
 
 # It needs a file from OpenIntents, so let's get it from Subversion...
-Build Version:1.4,6,40,target=android-4,prebuild=mkdir -p src/org/openintents/intents && svn cat -r 3070 http://openintents.googlecode.com/svn/trunk/shoppinglist/ShoppingList/src/org/openintents/intents/ShoppingListIntents.java >src/org/openintents/intents/ShoppingListIntents.java
+Build:1.4,6
+    commit=trolly_1.4
+    target=android-4
+    prebuild=mkdir -p src/org/openintents/intents && \
+        svn cat -r 3070 http://openintents.googlecode.com/svn/trunk/shoppinglist/ShoppingList/src/org/openintents/intents/ShoppingListIntents.java >src/org/openintents/intents/ShoppingListIntents.java
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.4
 Current Version Code:6
 
diff --git a/metadata/campyre.android.txt b/metadata/campyre.android.txt
index 0215c73246..bdcd490a49 100644
--- a/metadata/campyre.android.txt
+++ b/metadata/campyre.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:MIT
 Web Site:https://github.com/konklone/campyre
 Source Code:https://github.com/konklone/campyre
@@ -15,11 +15,10 @@ Description:
 Repo Type:git
 Repo:https://github.com/konklone/campyre.git
 
-Build Version:1.0.1,7,91b1224cc4bee18047,prebuild=rm -rf ./assets/releases
+Build Version:1.0.1,7,91b1224cc4bee18047
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:7
 
diff --git a/metadata/cc.co.eurdev.urecorder.txt b/metadata/cc.co.eurdev.urecorder.txt
index 343e0e0d1a..5780fdc9b4 100644
--- a/metadata/cc.co.eurdev.urecorder.txt
+++ b/metadata/cc.co.eurdev.urecorder.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://bitbucket.org/thomasebell/urecord/
 Source Code:https://bitbucket.org/thomasebell/urecord/
diff --git a/metadata/cc.rainwave.android.txt b/metadata/cc.rainwave.android.txt
new file mode 100644
index 0000000000..a050d9ef40
--- /dev/null
+++ b/metadata/cc.rainwave.android.txt
@@ -0,0 +1,27 @@
+Categories:Multimedia
+License:NewBSD
+Web Site:http://rainwave.cc
+Source Code:https://github.com/OEP/rainwave-android
+Issue Tracker:https://github.com/OEP/rainwave-android/issues
+
+Auto Name:Rainwave
+Summary:Client for music station
+Description:
+Rainwave.cc is an icecast music station and with the app you can
+listen to the music via *[[com.android.music]] or [[net.sourceforge.servestream]])
+and log in to rate and request tracks.
+.
+
+Repo Type:git
+Repo:https://github.com/OEP/rainwave-android.git
+
+Build:1.1,4
+    commit=36477326ec80e
+    init=sed -i 's/minSdkVersion="3"/minSdkVersion="4"/g' AndroidManifest.xml
+    target=android-8
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:4
+
diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt
index b56f27fa58..22e4dfaa2b 100644
--- a/metadata/cgeo.geocaching.txt
+++ b/metadata/cgeo.geocaching.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://www.cgeo.org
 Source Code:https://github.com/cgeo/c-geo-opensource
diff --git a/metadata/ch.blinkenlights.android.apnswitch.txt b/metadata/ch.blinkenlights.android.apnswitch.txt
index 6d519fce1c..161b517efc 100644
--- a/metadata/ch.blinkenlights.android.apnswitch.txt
+++ b/metadata/ch.blinkenlights.android.apnswitch.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/adrian-bl/APN-Switch
 Source Code:https://github.com/adrian-bl/APN-Switch
@@ -18,8 +18,7 @@ Repo:https://github.com/adrian-bl/APN-Switch.git
 Build Version:1.20111211,132351998,5517b4d7d3b73,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.20111211
 Current Version Code:132351998
 
diff --git a/metadata/ch.blinkenlights.android.vanilla.txt b/metadata/ch.blinkenlights.android.vanilla.txt
index 4d339798d2..f8d358e200 100644
--- a/metadata/ch.blinkenlights.android.vanilla.txt
+++ b/metadata/ch.blinkenlights.android.vanilla.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/adrian-bl/vanilla
 Source Code:https://github.com/adrian-bl/vanilla
diff --git a/metadata/ch.blinkenlights.battery.txt b/metadata/ch.blinkenlights.battery.txt
index 622bdf7a80..196143d633 100644
--- a/metadata/ch.blinkenlights.battery.txt
+++ b/metadata/ch.blinkenlights.battery.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://github.com/adrian-bl/bl-battstatus-android
 Source Code:https://github.com/adrian-bl/bl-battstatus-android
@@ -14,12 +14,19 @@ Repo Type:git
 Repo:https://github.com/adrian-bl/bl-battstatus-android.git
 
 #perlmagick required
-Build Version:1.81,1335983644,2bd476,target=android-4,prebuild=make refresh
+Build:1.81,1335983644
+    commit=2bd476
+    target=android-4
+    prebuild=make refresh
+
+Build:1.85,1388575122
+    disable=perl syntax errors
+    commit=3542bc93ad
+    target=android-10
+    prebuild=make refresh
 
 Auto Update Mode:None
-#puts version in strings.xml
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.81
-Current Version Code:1335983644
+Update Check Mode:RepoManifest
+Current Version:1.86
+Current Version Code:1388575122
 
diff --git a/metadata/ch.fixme.cowsay.txt b/metadata/ch.fixme.cowsay.txt
index 180d4750a4..ee574bf4a2 100644
--- a/metadata/ch.fixme.cowsay.txt
+++ b/metadata/ch.fixme.cowsay.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://fixme.ch/wiki/Cowsay_for_Android
 Source Code:https://github.com/rorist/Cowsay-android
@@ -11,12 +11,12 @@ Cowsay will turn text into happy ASCII cows, with speech (or thought) balloons.
 If you don't like cows, ASCII art is available to replace it with some other creatures
 (Tux, the BSD daemon, dragons, and a plethora of animals, from a turkey to an elephant in a snake)
 
-*Custom message
-*Multiple cows (additionnal Droid "cow")
-*Multiple faces
-*Say/Think
-*Share as ASCII or Image
-*Copy to clipboard
+* Custom message
+* Multiple cows (additionnal Droid "cow")
+* Multiple faces
+* Say/Think
+* Share as ASCII or Image
+* Copy to clipboard
 .
 
 Repo Type:git
@@ -25,8 +25,7 @@ Repo:https://github.com/rorist/Cowsay-android.git
 Build Version:1.3,4,d0b974abd8f918,subdir=android
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3
 Current Version Code:4
 
diff --git a/metadata/ch.fixme.status.txt b/metadata/ch.fixme.status.txt
index 427722d164..3e976e48b1 100644
--- a/metadata/ch.fixme.status.txt
+++ b/metadata/ch.fixme.status.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:
 Source Code:https://github.com/fixme-lausanne/MyHackerspace/
@@ -19,8 +19,12 @@ Build Version:1.6.1,10,56287be60f,prebuild=rm -rf apks/
 Build Version:1.7.1,14,e706cab0fd305,prebuild=rm -rf apks/
 Build Version:1.7.2,15,069efc060c192cc3a3c30996bc,prebuild=rm -rf apks/
 
+Build:1.7.3,16
+	commit=b57229c55c3ff
+	init=rm -rf apks/
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.7.2
-Current Version Code:15
+Current Version:1.7.3
+Current Version Code:16
 
diff --git a/metadata/ch.nexuscomputing.android.osciprimeics.txt b/metadata/ch.nexuscomputing.android.osciprimeics.txt
index 017da3d83c..445b52fb72 100644
--- a/metadata/ch.nexuscomputing.android.osciprimeics.txt
+++ b/metadata/ch.nexuscomputing.android.osciprimeics.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPL
 Web Site:http://www.osciprime.com/index.php
 Source Code:https://bitbucket.org/dalb8/osciiprime 
@@ -16,7 +16,7 @@ Repo:https://bitbucket.org/dalb8/osciiprime
 
 # already a prebuilt in jni/ but use NDK version instead
 Build Version:Dagobert,14,0,extlibs=android/android-support-v4.jar,\
-scanignore=build/ch.nexuscomputing.android.osciprimeics/jni,\
+scanignore=jni,\
 prebuild=cp $$NDK$$/platforms/android-14/arch-arm/usr/lib/liblog.so jni/,\
 buildjni=yes
 
diff --git a/metadata/ch.rrelmy.android.batterymanager.txt b/metadata/ch.rrelmy.android.batterymanager.txt
index 194f130d4a..d5c665d814 100644
--- a/metadata/ch.rrelmy.android.batterymanager.txt
+++ b/metadata/ch.rrelmy.android.batterymanager.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/rrelmy/BatteryLevel
 Source Code:https://github.com/rrelmy/BatteryLevel
diff --git a/metadata/ch.rrelmy.android.locationcachemap.txt b/metadata/ch.rrelmy.android.locationcachemap.txt
index 1914e782ce..d6edea2966 100644
--- a/metadata/ch.rrelmy.android.locationcachemap.txt
+++ b/metadata/ch.rrelmy.android.locationcachemap.txt
@@ -1,13 +1,13 @@
 #NonFreeDep can be removed with the Manifest patch below
 AntiFeatures:NonFreeDep
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/rrelmy/LocationCacheMap
 Source Code:https://github.com/rrelmy/LocationCacheMap
 Issue Tracker:https://github.com/rrelmy/LocationCacheMap/issues
 
 Auto Name:Location Cache Map
-Summary:Where was your device?
+Summary:Find where your device was
 Description:
 N.B Only applies if you are on Android 2.3.3-. Requires root.
 
diff --git a/metadata/cm.aptoide.pt.txt b/metadata/cm.aptoide.pt.txt
index 44ca3887c5..ca09f9abec 100644
--- a/metadata/cm.aptoide.pt.txt
+++ b/metadata/cm.aptoide.pt.txt
@@ -1,12 +1,12 @@
 Disabled:bad use of version control. non free libraries and inconsistent licensing
-Category:System
+Categories:System
 License:GPL
 Web Site:http://www.aptoide.com/
 Source Code:http://aptoide.org/trac
 Issue Tracker:http://aptoide.org/trac
 
 Auto Name:Aptoide
-Summary:A package installer.
+Summary:A package installer
 Description:
 Aptoide is a simple repository and package installer. F-Droid was originally
 based on Aptoide!
diff --git a/metadata/com.FireFart.Permissions2.txt b/metadata/com.FireFart.Permissions2.txt
index 3c47a61d53..d557d60ba7 100644
--- a/metadata/com.FireFart.Permissions2.txt
+++ b/metadata/com.FireFart.Permissions2.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/FireFart/Permissions
 Source Code:https://github.com/FireFart/Permissions
-Issue Tracker:http://code.google.com/p/androidpermissions/issues/list
+Issue Tracker:http://code.google.com/p/androidpermissions/issues
 
 Auto Name:Permissions
 Summary:Lists application permissions
@@ -19,8 +19,7 @@ Repo:https://github.com/FireFart/Permissions.git
 Build Version:1.2,3,c2b651a63
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2
 Current Version Code:3
 
diff --git a/metadata/com.MarcosDiez.shareviahttp.txt b/metadata/com.MarcosDiez.shareviahttp.txt
index 83cef4db54..2159ea3f11 100644
--- a/metadata/com.MarcosDiez.shareviahttp.txt
+++ b/metadata/com.MarcosDiez.shareviahttp.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:NewBSD
 Web Site:http://code.google.com/p/share-via-http
-Source Code:http://code.google.com/p/share-via-http/source/list
-Issue Tracker:http://code.google.com/p/share-via-http/issues/list
+Source Code:http://code.google.com/p/share-via-http/source
+Issue Tracker:http://code.google.com/p/share-via-http/issues
 
 Auto Name:Share via HTTP
 Summary:File sharing tool
@@ -21,12 +21,19 @@ time from the screen that shows the URL (press the back button if you're on the
 Repo Type:hg
 Repo:https://code.google.com/p/share-via-http/
 
-Build Version:1.10,11,f6566f6ae61d,subdir=ShareViaHttp,target=android-15,\
-prebuild=wget http://repo1.maven.org/maven2/com/googlecode/androidannotations/androidannotations/2.5.1/androidannotations-2.5.1.jar -P libs/
+Build:1.10,11
+    commit=f6566f6ae61d
+    subdir=ShareViaHttp
+    target=android-15
+    prebuild=wget http://repo1.maven.org/maven2/com/googlecode/androidannotations/androidannotations/2.5.1/androidannotations-2.5.1.jar -P libs/
+
+Build:1.11,12
+    commit=ffd7026be9d0
+    subdir=ShareViaHttp
+    prebuild=wget http://repo1.maven.org/maven2/com/googlecode/androidannotations/androidannotations/2.5.1/androidannotations-2.5.1.jar -P libs/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.10
-Current Version Code:11
+Update Check Mode:RepoManifest
+Current Version:1.11
+Current Version Code:12
 
diff --git a/metadata/com.abcdjdj.rootverifier.txt b/metadata/com.abcdjdj.rootverifier.txt
index 66114d09ab..eb9c47d88a 100644
--- a/metadata/com.abcdjdj.rootverifier.txt
+++ b/metadata/com.abcdjdj.rootverifier.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2+
 Web Site:
 Source Code:https://github.com/abcdjdj/RootVerifier-APP
@@ -15,10 +15,14 @@ don't know whether their device is rooted yet.
 Repo Type:git
 Repo:https://github.com/abcdjdj/RootVerifier-APP.git
 
-Build Version:1.2,3,ff498b24bee87
+Build:1.2,3
+    commit=ff498b24bee87
+
+Build:1.3,4
+    commit=f2fb7be5feff5a6fb998
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.2
-Current Version Code:3
+Current Version:1.3
+Current Version Code:4
 
diff --git a/metadata/com.achep.widget.jellyclock.txt b/metadata/com.achep.widget.jellyclock.txt
index a46e23d258..255b48a51b 100644
--- a/metadata/com.achep.widget.jellyclock.txt
+++ b/metadata/com.achep.widget.jellyclock.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/AChep/JellyBeanClock
 Source Code:https://github.com/AChep/JellyBeanClock
diff --git a/metadata/com.adam.aslfms.txt b/metadata/com.adam.aslfms.txt
index ce35b85f1d..ac10071290 100644
--- a/metadata/com.adam.aslfms.txt
+++ b/metadata/com.adam.aslfms.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/tgwizard/sls
 Source Code:https://github.com/tgwizard/sls
diff --git a/metadata/com.addi.txt b/metadata/com.addi.txt
index 17395380bb..249d9d7495 100644
--- a/metadata/com.addi.txt
+++ b/metadata/com.addi.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://code.google.com/p/addi/
-Source Code:http://code.google.com/p/addi/source/checkout
-Issue Tracker:http://code.google.com/p/addi/issues/list
+Source Code:http://code.google.com/p/addi/source
+Issue Tracker:http://code.google.com/p/addi/issues
 Donate:http://code.google.com/p/addi/wiki/Donate
 
 Auto Name:Addi
@@ -25,8 +25,7 @@ Build Version:1.97,43,!No source code
 Build Version:1.98,44,198,buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.98
 Current Version Code:44
 
diff --git a/metadata/com.adstrosoftware.launchappops.txt b/metadata/com.adstrosoftware.launchappops.txt
index bc21b10a92..c72843a7c6 100644
--- a/metadata/com.adstrosoftware.launchappops.txt
+++ b/metadata/com.adstrosoftware.launchappops.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/adstro/launch-app-ops
diff --git a/metadata/com.agiro.scanner.android.txt b/metadata/com.agiro.scanner.android.txt
index 08e38d30ad..d5a7525488 100644
--- a/metadata/com.agiro.scanner.android.txt
+++ b/metadata/com.agiro.scanner.android.txt
@@ -1,5 +1,5 @@
 Disabled:no source for this application any more
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/pakerfeldt/aGiro
diff --git a/metadata/com.akop.bach.txt b/metadata/com.akop.bach.txt
new file mode 100644
index 0000000000..f7dc7adcda
--- /dev/null
+++ b/metadata/com.akop.bach.txt
@@ -0,0 +1,27 @@
+Categories:Games
+License:GPLv3
+Source Code:https://github.com/melllvar/Spark360
+Issue Tracker:https://github.com/melllvar/Spark360/issues
+
+Summary:Gaming client
+Description:
+Supports Xbox Live and the PlayStation Network. 
+The app allows you to monitor your achievements, trophies, friends' statuses, 
+and includes many other features, such as trophy/achievement comparisons, 
+messaging (Xbox Live), home screen widgets, notifications, and much more.
+
+Spark 360 is an unofficial application, and not supported, endorsed, or 
+affiliated with Microsoft Corporation or Sony Corporation.
+.
+
+Repo Type:git
+Repo:https://github.com/melllvar/Spark360.git
+
+Build:6.20,116
+    commit=v6.20
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:6.20
+Current Version Code:116
+
diff --git a/metadata/com.alfray.asqare.txt b/metadata/com.alfray.asqare.txt
index f2704ea3b9..a5bd092fad 100644
--- a/metadata/com.alfray.asqare.txt
+++ b/metadata/com.alfray.asqare.txt
@@ -1,7 +1,7 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/asqare/
-Source Code:https://code.google.com/p/asqare/source/list
+Source Code:https://code.google.com/p/asqare/source
 Issue Tracker:
 
 Auto Name:Asqare
diff --git a/metadata/com.alfray.mandelbrot2.txt b/metadata/com.alfray.mandelbrot2.txt
index 0244b888d9..9da6df1609 100644
--- a/metadata/com.alfray.mandelbrot2.txt
+++ b/metadata/com.alfray.mandelbrot2.txt
@@ -1,8 +1,8 @@
 Disabled:Past sell by date
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/mandelbrot/
-Source Code:http://code.google.com/p/mandelbrot/source/checkout
+Source Code:http://code.google.com/p/mandelbrot/source
 Issue Tracker:
 
 Auto Name:Mandelbrot Map
diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
index 6b0959de76..3bb150b96d 100644
--- a/metadata/com.alfray.timeriffic.txt
+++ b/metadata/com.alfray.timeriffic.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/timeriffic/
-Source Code:http://code.google.com/p/timeriffic/source/checkout
-Issue Tracker:http://code.google.com/p/autosettings/issues/list
+Source Code:http://code.google.com/p/timeriffic/source
+Issue Tracker:http://code.google.com/p/autosettings/issues
 
 Summary:Scheduled settings
 Description:
@@ -12,16 +12,11 @@ WiFi and airplane mode.
 Status: Source code was last published in 2011.
 .
 
-#This previous version was svn from http://timeriffic.googlecode.com/svn/trunk/
-#Build Version:1.09.03,10903,45,subdir=Timeriffic,oldsdkloc=yes
+Build Version:1.09.03,10903,!huge ass version name at 45,subdir=Timeriffic,oldsdkloc=yes
 
 #This version was from https://timeriffic.googlecode.com/hg/
 Build Version:1.09.05,10905,fc40dccbb9,subdir=Timeriffic,oldsdkloc=yes,novcheck=yes,bindir=Timeriffic/bin2
-#NOTE: Far from obvious which commit corresponds to version 1.09.09. Also
-#note the source tree re-org, which means some of the settings above need
-#to change, and also the switch to android-11 as a target.
-Build Version:1.09.11,10911,!Can't find correct commit. See metadata notes too.
-Build Version:1.09.12,10912,!Source code is not published
+
 Build Version:1.10.01,11001,!Source code is not published
 
 Auto Update Mode:None
diff --git a/metadata/com.amphoras.tpthelper.txt b/metadata/com.amphoras.tpthelper.txt
index 9e843990cf..a5e8a1c9ad 100644
--- a/metadata/com.amphoras.tpthelper.txt
+++ b/metadata/com.amphoras.tpthelper.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/Amphoras/TPT-Helper
 Source Code:https://github.com/Amphoras/TPT-Helper/tree/V2.0.3/TPT%20Helper
@@ -18,8 +18,7 @@ Repo:https://github.com/Amphoras/TPT-Helper.git
 Build Version:2.0.3,24,e2c80263eef99fd6ab4aa656bfae47a22389493f,subdir=TPT Helper,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.3
 Current Version Code:24
 
diff --git a/metadata/com.ancantus.HYPNOTOAD.txt b/metadata/com.ancantus.HYPNOTOAD.txt
new file mode 100644
index 0000000000..f8846328f2
--- /dev/null
+++ b/metadata/com.ancantus.HYPNOTOAD.txt
@@ -0,0 +1,23 @@
+Categories:Wallpaper
+License:GPLv3
+Web Site:
+Source Code:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/src
+Issue Tracker:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper/issues
+
+Auto Name:Hypnotoad Live Wallpaper
+Summary:Live wallpaper
+Description:
+Strange toad blinking in front of a static picture.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/Ancantus/hypnotoad_live_wallpaper
+
+Build:1.3,4
+    commit=9b411
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:4
+
diff --git a/metadata/com.andrew.apollo.txt b/metadata/com.andrew.apollo.txt
index e2f75d626e..c03ed50513 100644
--- a/metadata/com.andrew.apollo.txt
+++ b/metadata/com.andrew.apollo.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:
 Source Code:https://github.com/adneal/Apollo-CM
-Issue Tracker:http://code.google.com/p/apollo-music-player/issues/list
+Issue Tracker:http://code.google.com/p/apollo-music-player/issues
 Donate:http://www.cyanogenmod.org
 
 Auto Name:Apollo
diff --git a/metadata/com.android.camera2.txt b/metadata/com.android.camera2.txt
new file mode 100644
index 0000000000..0af0f33f0d
--- /dev/null
+++ b/metadata/com.android.camera2.txt
@@ -0,0 +1,38 @@
+Category:Multimedia
+License:Apache2
+Web Site:
+Source Code:https://github.com/CyanogenMod/android_packages_apps_Camera2
+Issue Tracker:http://code.google.com/p/android/issues
+
+Summary:Stock camera
+Description:
+This is the camera2 package which is a new package in Android 4.4,
+but it's compatible with Android 4.0.
+.
+
+Repo Type:git
+Repo:https://android.googlesource.com/platform/packages/apps/Camera2
+
+Build:4.4.2,1
+    commit=android-4.4.2_r1
+    target=android-19
+    extlibs=android/android-support-v13.jar
+    srclibs=Xmp@android-4.4.2_r1
+    patch=build.xml_1.patch
+    rm=tests
+    prebuild=cp -r $$Xmp$$ . && \
+             echo -e 'source.dir=src_pd;src_pd_gcam;src;Xmp/XMPCore/src\nversion.name=4.4.2\nversion.code=1' >> ant.properties && \
+             echo 'APP_ABI := all' >> jni/Application.mk
+    buildjni=yes
+
+Maintainer Notes:
+You could alway switch this to Cyanogenmod or OmniROM but at the moment they are very similar
+See version.mk for their version scheme
+
+build.xml patches are hairy; one can also use custom_rules.xml
+.
+
+Update Check Mode:None
+Current Version:4.2.1
+Current Version Code:1
+
diff --git a/metadata/com.android.camera2/build.xml_1.patch b/metadata/com.android.camera2/build.xml_1.patch
new file mode 100644
index 0000000000..cfbd9533e6
--- /dev/null
+++ b/metadata/com.android.camera2/build.xml_1.patch
@@ -0,0 +1,104 @@
+diff --git a/build.xml b/build.xml
+index 5a8eefa..a7f41d8 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1,10 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="com.android.camera2" default="help">
++<project name="Camera2" default="help">
+ 
+     <!-- The local.properties file is created and updated by the 'android' tool.
+          It contains the path to the SDK. It should *NOT* be checked into
+          Version Control Systems. -->
+-    <property file="local.properties" />
++    <loadproperties srcFile="local.properties" />
+ 
+     <!-- The ant.properties file can be created by you. It is only edited by the
+          'android' tool to add properties to it.
+@@ -28,15 +28,6 @@
+          -->
+     <property file="ant.properties" />
+ 
+-    <!-- if sdk.dir was not set from one of the property file, then
+-         get it from the ANDROID_HOME env var.
+-         This must be done before we load project.properties since
+-         the proguard config can use sdk.dir -->
+-    <property environment="env" />
+-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+-        <isset property="env.ANDROID_HOME" />
+-    </condition>
+-
+     <!-- The project.properties file is created and updated by the 'android'
+          tool, as well as ADT.
+ 
+@@ -50,23 +41,56 @@
+ 
+     <!-- quick check on sdk.dir -->
+     <fail
+-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+             unless="sdk.dir"
+     />
+ 
+-    <!--
+-        Import per project custom build rules if present at the root of the project.
+-        This is the place to put custom intermediary targets such as:
+-            -pre-build
+-            -pre-compile
+-            -post-compile (This is typically used for code obfuscation.
+-                           Compiled code location: ${out.classes.absolute.dir}
+-                           If this is not done in place, override ${out.dex.input.absolute.dir})
+-            -post-package
+-            -post-build
+-            -pre-clean
+-    -->
+-    <import file="custom_rules.xml" optional="true" />
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++    </target>
++-->
++
++    <!-- Puts the project's resources into the output package file
++         This actually can create multiple resource package in case
++         Some custom apk with specific configuration have been
++         declared in default.properties.
++         -->
++    <target name="-package-resources" depends="-crunch">
++        <!-- only package resources if *not* a library project -->
++        <do-only-if-not-library elseText="Library project: do not package resources..." >
++            <aapt executable="${aapt}"
++                    command="package"
++                    versioncode="${version.code}"
++                    versionname="${version.name}"
++                    manifest="${out.manifest.abs.file}"
++                    assets="${asset.absolute.dir}"
++                    androidjar="${project.target.android.jar}"
++                    apkfolder="${out.absolute.dir}"
++                    nocrunch="${build.packaging.nocrunch}"
++                    resourcefilename="${resource.package.file.name}"
++                    resourcefilter="${aapt.resource.filter}"
++                    libraryResFolderPathRefid="project.library.res.folder.path"
++                    libraryPackagesRefid="project.library.packages"
++                    previousBuildType="${build.last.target}"
++                    buildType="${build.target}"
++                    libraryRFileRefid="project.library.bin.r.file.path"
++                    ignoreAssets="${aapt.ignore.assets}">
++                <res path="${out.res.absolute.dir}" />
++                <res path="${resource.absolute.dir}" />
++            </aapt>
++        </do-only-if-not-library>
++    </target>
+ 
+     <!-- Import the actual build file.
+ 
diff --git a/metadata/com.android.inputmethod.latin.txt b/metadata/com.android.inputmethod.latin.txt
new file mode 100644
index 0000000000..dc8429f992
--- /dev/null
+++ b/metadata/com.android.inputmethod.latin.txt
@@ -0,0 +1,75 @@
+Categories:System
+License:Apache2
+Source Code:https://android.googlesource.com/platform/packages/inputmethods/LatinIME
+Issue Tracker:http://code.google.com/p/android/issues
+
+Summary:Stock keyboard
+Description:
+The current version comes with English, Spanish, Russian, Brazilian, Italian, 
+German, French, dictionaries; there are more language word lists 
+in the repository but they'd need to be compiled.
+There is the ability to input a limited amount of Emoji characters.
+
+Note that you can't install this if you have a ROM that already has LatinIME.
+The build recipe contains a package name change variable, but on Android 4.3
+it still couldn't be installed as a user app; you'd have to 
+remove the original from /system/app via root, before installing this.
+.
+
+Repo Type:git
+Repo:https://android.googlesource.com/platform/packages/inputmethods/LatinIME
+
+Build:4.4.2-MIPS,4421
+    commit=android-sdk-4.4.2_r1
+    subdir=java
+    target=android-19
+    srclibs=Inputmethodcommon@android-4.4.2_r1
+    extlibs=android/android-support-v4.jar
+    patch=custom_rules.xml_1.patch
+    prebuild=echo -e 'package.name=com.android.inputmethod.latin\nversion.name=4.4.2-MIPS\nversion.code=4421' >> ant.properties && \
+        cp -r $$Inputmethodcommon$$/java/com/android/inputmethodcommon src/com/android/
+    build=$$NDK$$/ndk-build -e "APP_ABI=mips" -e "APP_CFLAGS += -w" -C ../native && mv ../native/libs/* libs/
+
+Build:4.4.2-x86,4422
+    commit=android-sdk-4.4.2_r1
+    subdir=java
+    target=android-19
+    srclibs=Inputmethodcommon@android-4.4.2_r1
+    extlibs=android/android-support-v4.jar
+    patch=custom_rules.xml_1.patch
+    prebuild=echo -e 'package.name=com.android.inputmethod.latin\nversion.name=4.4.2-x86\nversion.code=4422' >> ant.properties && \
+        cp -r $$Inputmethodcommon$$/java/com/android/inputmethodcommon src/com/android/
+    build=$$NDK$$/ndk-build -e "APP_ABI=x86" -e "APP_CFLAGS += -w" -C ../native && mv ../native/libs/* libs/
+
+Build:4.4.2-ARM,4423
+    commit=android-sdk-4.4.2_r1
+    subdir=java
+    target=android-19
+    srclibs=Inputmethodcommon@android-4.4.2_r1
+    extlibs=android/android-support-v4.jar
+    patch=custom_rules.xml_1.patch
+    prebuild=echo -e 'package.name=com.android.inputmethod.latin\nversion.name=4.4.2-ARM\nversion.code=4423' >> ant.properties && \
+        cp -r $$Inputmethodcommon$$/java/com/android/inputmethodcommon src/com/android/
+    build=$$NDK$$/ndk-build -e "APP_ABI=armeabi" -e "APP_CFLAGS += -w" -C ../native && mv ../native/libs/* libs/
+
+Build:4.4.2-ARMv7,4424
+    commit=android-sdk-4.4.2_r1
+    subdir=java
+    target=android-19
+    srclibs=Inputmethodcommon@android-4.4.2_r1
+    extlibs=android/android-support-v4.jar
+    patch=custom_rules.xml_1.patch
+    prebuild=echo -e 'package.name=com.android.inputmethod.latin\nversion.name=4.4.2-ARMv7\nversion.code=4424' >> ant.properties && \
+        cp -r $$Inputmethodcommon$$/java/com/android/inputmethodcommon src/com/android/
+    build=$$NDK$$/ndk-build -e "APP_ABI=armeabi-v7a" -e "APP_CFLAGS += -w" -C ../native && mv ../native/libs/* libs/
+
+Maintainer Notes:
+Note that, like other AOSP apps, there are now special tags with 'sdk' in them; 
+not sure what the difference is.
+.
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:4.4.2
+Current Version Code:4424
+
diff --git a/metadata/com.android.inputmethod.latin/build.xml_1.patch b/metadata/com.android.inputmethod.latin/build.xml_1.patch
new file mode 100644
index 0000000000..a725346799
--- /dev/null
+++ b/metadata/com.android.inputmethod.latin/build.xml_1.patch
@@ -0,0 +1,114 @@
+commit 707ce843b385d21af5339c5bed0023f26a43a2fa
+Author: David Black <david8black@gmail.com>
+Date:   Tue Dec 24 19:29:29 2013 +0000
+
+    s
+
+diff --git a/java/build.xml b/java/build.xml
+index d51b4ae..8dc27e8 100644
+--- a/java/build.xml
++++ b/java/build.xml
+@@ -1,10 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="java" default="help">
++<project name="LatinIME" default="help">
+ 
+     <!-- The local.properties file is created and updated by the 'android' tool.
+          It contains the path to the SDK. It should *NOT* be checked into
+          Version Control Systems. -->
+-    <property file="local.properties" />
++    <loadproperties srcFile="local.properties" />
+ 
+     <!-- The ant.properties file can be created by you. It is only edited by the
+          'android' tool to add properties to it.
+@@ -28,15 +28,6 @@
+          -->
+     <property file="ant.properties" />
+ 
+-    <!-- if sdk.dir was not set from one of the property file, then
+-         get it from the ANDROID_HOME env var.
+-         This must be done before we load project.properties since
+-         the proguard config can use sdk.dir -->
+-    <property environment="env" />
+-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+-        <isset property="env.ANDROID_HOME" />
+-    </condition>
+-
+     <!-- The project.properties file is created and updated by the 'android'
+          tool, as well as ADT.
+ 
+@@ -50,23 +41,60 @@
+ 
+     <!-- quick check on sdk.dir -->
+     <fail
+-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+             unless="sdk.dir"
+     />
+ 
+-    <!--
+-        Import per project custom build rules if present at the root of the project.
+-        This is the place to put custom intermediary targets such as:
+-            -pre-build
+-            -pre-compile
+-            -post-compile (This is typically used for code obfuscation.
+-                           Compiled code location: ${out.classes.absolute.dir}
+-                           If this is not done in place, override ${out.dex.input.absolute.dir})
+-            -post-package
+-            -post-build
+-            -pre-clean
+-    -->
+-    <import file="custom_rules.xml" optional="true" />
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++    </target>
++-->
++
++    <!-- Puts the project's resources into the output package file
++         This actually can create multiple resource package in case
++         Some custom apk with specific configuration have been
++         declared in default.properties.
++         -->
++    <target name="-package-resources" depends="-crunch">
++        <!-- only package resources if *not* a library project -->
++        <do-only-if-not-library elseText="Library project: do not package resources..." >
++            <aapt executable="${aapt}"
++                    command="package"
++                    versioncode="${version.code}"
++                    versionname="${version.name}"
++                    debug="${build.is.packaging.debug}"
++                    manifest="${out.manifest.abs.file}"
++                    assets="${asset.absolute.dir}"
++                    androidjar="${project.target.android.jar}"
++                    apkfolder="${out.absolute.dir}"
++                    nocrunch="${build.packaging.nocrunch}"
++                    resourcefilename="${resource.package.file.name}"
++                    resourcefilter="${aapt.resource.filter}"
++                    libraryResFolderPathRefid="project.library.res.folder.path"
++                    libraryPackagesRefid="project.library.packages"
++                    previousBuildType="${build.last.target}"
++                    buildType="${build.target}"
++                    libraryRFileRefid="project.library.bin.r.file.path"
++                    manifestpackage="${package.name}"
++                    ignoreAssets="${aapt.ignore.assets}">
++                <res path="${out.res.absolute.dir}" />
++                <res path="${resource.absolute.dir}" />
++                <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
++                <nocompress extension="dict" />
++            </aapt>
++        </do-only-if-not-library>
++    </target>
+ 
+     <!-- Import the actual build file.
+ 
diff --git a/metadata/com.android.inputmethod.latin/custom_rules.xml_1.patch b/metadata/com.android.inputmethod.latin/custom_rules.xml_1.patch
new file mode 100644
index 0000000000..b91894ccbf
--- /dev/null
+++ b/metadata/com.android.inputmethod.latin/custom_rules.xml_1.patch
@@ -0,0 +1,126 @@
+diff --git a/java/custom_rules.xml b/java/custom_rules.xml
+new file mode 100644
+index 0000000..25fc1eb
+--- /dev/null
++++ b/java/custom_rules.xml
+@@ -0,0 +1,120 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="LatinIME" default="help">
++
++    <!-- The local.properties file is created and updated by the 'android' tool.
++         It contains the path to the SDK. It should *NOT* be checked into
++         Version Control Systems. -->
++    <loadproperties srcFile="local.properties" />
++
++    <!-- The ant.properties file can be created by you. It is only edited by the
++         'android' tool to add properties to it.
++         This is the place to change some Ant specific build properties.
++         Here are some properties you may want to change/update:
++
++         source.dir
++             The name of the source directory. Default is 'src'.
++         out.dir
++             The name of the output directory. Default is 'bin'.
++
++         For other overridable properties, look at the beginning of the rules
++         files in the SDK, at tools/ant/build.xml
++
++         Properties related to the SDK location or the project target should
++         be updated using the 'android' tool with the 'update' action.
++
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems.
++
++         -->
++    <property file="ant.properties" />
++
++    <!-- The project.properties file is created and updated by the 'android'
++         tool, as well as ADT.
++
++         This contains project specific properties such as project target, and library
++         dependencies. Lower level build properties are stored in ant.properties
++         (or in .classpath for Eclipse projects).
++
++         This file is an integral part of the build system for your
++         application and should be checked into Version Control Systems. -->
++    <loadproperties srcFile="project.properties" />
++
++    <!-- quick check on sdk.dir -->
++    <fail
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
++            unless="sdk.dir"
++    />
++
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++    </target>
++-->
++
++    <!-- Puts the project's resources into the output package file
++         This actually can create multiple resource package in case
++         Some custom apk with specific configuration have been
++         declared in default.properties.
++         -->
++    <target name="-package-resources" depends="-crunch">
++        <!-- only package resources if *not* a library project -->
++        <do-only-if-not-library elseText="Library project: do not package resources..." >
++            <aapt executable="${aapt}"
++                    command="package"
++                    versioncode="${version.code}"
++                    versionname="${version.name}"
++                    debug="${build.is.packaging.debug}"
++                    manifest="${out.manifest.abs.file}"
++                    assets="${asset.absolute.dir}"
++                    androidjar="${project.target.android.jar}"
++                    apkfolder="${out.absolute.dir}"
++                    nocrunch="${build.packaging.nocrunch}"
++                    resourcefilename="${resource.package.file.name}"
++                    resourcefilter="${aapt.resource.filter}"
++                    libraryResFolderPathRefid="project.library.res.folder.path"
++                    libraryPackagesRefid="project.library.packages"
++                    previousBuildType="${build.last.target}"
++                    buildType="${build.target}"
++                    libraryRFileRefid="project.library.bin.r.file.path"
++                    manifestpackage="${package.name}"
++                    ignoreAssets="${aapt.ignore.assets}">
++                <res path="${out.res.absolute.dir}" />
++                <res path="${resource.absolute.dir}" />
++                <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
++                <nocompress extension="dict" />
++            </aapt>
++        </do-only-if-not-library>
++    </target>
++
++    <!-- Import the actual build file.
++
++         To customize existing targets, there are two options:
++         - Customize only one target:
++             - copy/paste the target into this file, *before* the
++               <import> task.
++             - customize it to your needs.
++         - Customize the whole content of build.xml
++             - copy/paste the content of the rules files (minus the top node)
++               into this file, replacing the <import> task.
++             - customize to your needs.
++
++         ***********************
++         ****** IMPORTANT ******
++         ***********************
++         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
++         in order to avoid having your file be overridden by tools such as "android update project"
++    -->
++    <!-- version-tag: 1 -->
++    <import file="${sdk.dir}/tools/ant/build.xml" />
++
++</project>
diff --git a/metadata/com.android.inputmethod.norwegian.txt b/metadata/com.android.inputmethod.norwegian.txt
index d22b7d61ee..ef6293aead 100644
--- a/metadata/com.android.inputmethod.norwegian.txt
+++ b/metadata/com.android.inputmethod.norwegian.txt
@@ -1,9 +1,9 @@
 Disabled:Can't build dictionary libraries
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/scandinavian-keyboard/
-Source Code:http://code.google.com/p/scandinavian-keyboard/source/checkout
-Issue Tracker:http://code.google.com/p/scandinavian-keyboard/issues/list
+Source Code:http://code.google.com/p/scandinavian-keyboard/source
+Issue Tracker:http://code.google.com/p/scandinavian-keyboard/issues
 Donate:http://code.google.com/p/scandinavian-keyboard/
 
 Auto Name:Scandinavian keyboard
diff --git a/metadata/com.android.inputmethod.pinyin.txt b/metadata/com.android.inputmethod.pinyin.txt
index 2d6363771c..14ea025890 100644
--- a/metadata/com.android.inputmethod.pinyin.txt
+++ b/metadata/com.android.inputmethod.pinyin.txt
@@ -1,21 +1,26 @@
-Category:System
+Categories:System
 License:Apache2
-Web Site:https://github.com/CyanogenMod/
-Source Code:https://github.com/CyanogenMod/android_packages_inputmethods_PinyinIME/tree
+Source Code:https://android.googlesource.com/platform/packages/inputmethods/PinyinIME
 Issue Tracker:
 
 Auto Name:谷歌拼音输入法
 Summary:Input method for Pinyin
 Description:
 Pinyin IME from the AOSP. It is not only of use to Chinese writers but to English writers too because
-it has a T9 style keyboard for writing in English
+it has a T9 style keyboard for writing in English.
 .
 
 Repo Type:git
-Repo:https://github.com/CyanogenMod/android_packages_inputmethods_PinyinIME.git
+Repo:https://android.googlesource.com/platform/packages/inputmethods/PinyinIME
 
-#ndk failure,probably needs AOSP
-Build Version:1,1,!272bd,buildjni=yes,forceversion=yes,forcevercode=yes,target=android-15
+Build:4.2.1,1
+    commit=android-4.4.2_r1
+    disable=uses import android.os.SystemProperties
+    target=android-19
+    patch=build_1.patch;ndk-build_1.patch
+    prebuild=mv lib/com/android/inputmethod/pinyin/* src/com/android/inputmethod/pinyin/ && \
+         echo -e 'version.name=4.2.1\nversion.code=1' > ant.properties
+    buildjni=yes
 
 Auto Update Mode:None
 #In Market as com.google.android.inputmethod.pinyin
diff --git a/metadata/com.android.inputmethod.pinyin/build_1.patch b/metadata/com.android.inputmethod.pinyin/build_1.patch
new file mode 100644
index 0000000000..d268308aa3
--- /dev/null
+++ b/metadata/com.android.inputmethod.pinyin/build_1.patch
@@ -0,0 +1,109 @@
+diff --git a/build.xml b/build.xml
+index 505e9a0..6c08dac 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1,10 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="com.android.inputmethod.pinyin" default="help">
++<project name="PinyinIME" default="help">
+ 
+     <!-- The local.properties file is created and updated by the 'android' tool.
+          It contains the path to the SDK. It should *NOT* be checked into
+          Version Control Systems. -->
+-    <property file="local.properties" />
++    <loadproperties srcFile="local.properties" />
+ 
+     <!-- The ant.properties file can be created by you. It is only edited by the
+          'android' tool to add properties to it.
+@@ -28,15 +28,6 @@
+          -->
+     <property file="ant.properties" />
+ 
+-    <!-- if sdk.dir was not set from one of the property file, then
+-         get it from the ANDROID_HOME env var.
+-         This must be done before we load project.properties since
+-         the proguard config can use sdk.dir -->
+-    <property environment="env" />
+-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+-        <isset property="env.ANDROID_HOME" />
+-    </condition>
+-
+     <!-- The project.properties file is created and updated by the 'android'
+          tool, as well as ADT.
+ 
+@@ -50,23 +41,61 @@
+ 
+     <!-- quick check on sdk.dir -->
+     <fail
+-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
++            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+             unless="sdk.dir"
+     />
+ 
+-    <!--
+-        Import per project custom build rules if present at the root of the project.
+-        This is the place to put custom intermediary targets such as:
+-            -pre-build
+-            -pre-compile
+-            -post-compile (This is typically used for code obfuscation.
+-                           Compiled code location: ${out.classes.absolute.dir}
+-                           If this is not done in place, override ${out.dex.input.absolute.dir})
+-            -post-package
+-            -post-build
+-            -pre-clean
+-    -->
+-    <import file="custom_rules.xml" optional="true" />
++
++<!-- extension targets. Uncomment the ones where you want to do custom work
++     in between standard targets -->
++<!--
++    <target name="-pre-build">
++    </target>
++    <target name="-pre-compile">
++    </target>
++
++    /* This is typically used for code obfuscation.
++       Compiled code location: ${out.classes.absolute.dir}
++       If this is not done in place, override ${out.dex.input.absolute.dir} */
++    <target name="-post-compile">
++    </target>
++-->
++
++    <!-- Puts the project's resources into the output package file
++         This actually can create multiple resource package in case
++         Some custom apk with specific configuration have been
++         declared in default.properties.
++         -->
++    <target name="-package-resources" depends="-crunch">
++        <!-- only package resources if *not* a library project -->
++        <do-only-if-not-library elseText="Library project: do not package resources..." >
++            <aapt executable="${aapt}"
++                    command="package"
++                    versioncode="${version.code}"
++                    versionname="${version.name}"
++                    debug="${build.is.packaging.debug}"
++                    manifest="${out.manifest.abs.file}"
++                    assets="${asset.absolute.dir}"
++                    androidjar="${project.target.android.jar}"
++                    apkfolder="${out.absolute.dir}"
++                    nocrunch="${build.packaging.nocrunch}"
++                    resourcefilename="${resource.package.file.name}"
++                    resourcefilter="${aapt.resource.filter}"
++                    libraryResFolderPathRefid="project.library.res.folder.path"
++                    libraryPackagesRefid="project.library.packages"
++                    previousBuildType="${build.last.target}"
++                    buildType="${build.target}"
++                    libraryRFileRefid="project.library.bin.r.file.path"
++                    manifestpackage="${package.name}"
++                    ignoreAssets="${aapt.ignore.assets}">
++                <res path="${out.res.absolute.dir}" />
++                <res path="${resource.absolute.dir}" />
++                <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
++                <nocompress extension="dict" />
++                <nocompress extension="dat" />
++            </aapt>
++        </do-only-if-not-library>
++    </target>
+ 
+     <!-- Import the actual build file.
+ 
diff --git a/metadata/com.android.inputmethod.pinyin/ndk-build_1.patch b/metadata/com.android.inputmethod.pinyin/ndk-build_1.patch
new file mode 100644
index 0000000000..9402b6e760
--- /dev/null
+++ b/metadata/com.android.inputmethod.pinyin/ndk-build_1.patch
@@ -0,0 +1,51 @@
+diff --git a/jni/Android.mk b/jni/Android.mk
+index 9b168aa..157443d 100644
+--- a/jni/Android.mk
++++ b/jni/Android.mk
+@@ -24,9 +24,8 @@ LOCAL_SRC_FILES := \
+ 	share/sync.cpp
+ 
+ LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)
+-LOCAL_LDLIBS += -lpthread
+ LOCAL_MODULE := libjni_pinyinime
+-LOCAL_SHARED_LIBRARIES := libcutils libutils
++LOCAL_SHARED_LIBRARIES := libutils
+ LOCAL_MODULE_TAGS := optional
+ 
+ include $(BUILD_SHARED_LIBRARY)
+diff --git a/jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp b/jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp
+index dcb63a1..3d232ad 100644
+--- a/jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp
++++ b/jni/android/com_android_inputmethod_pinyin_PinyinDecoderService.cpp
+@@ -15,7 +15,6 @@
+  */
+ 
+ #include <assert.h>
+-#include <cutils/log.h>
+ #include <jni.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -388,11 +387,8 @@ static int registerNativeMethods(JNIEnv* env, const char* className,
+     }
+ 
+     clazz = env->FindClass("java/io/FileDescriptor");
+-    LOG_FATAL_IF(clazz == NULL, "Unable to find Java class java.io.FileDescriptor");
+     gFileDescriptorOffsets.mClass = (jclass) env->NewGlobalRef(clazz);
+     gFileDescriptorOffsets.mDescriptor = env->GetFieldID(clazz, "descriptor", "I");
+-    LOG_FATAL_IF(gFileDescriptorOffsets.mDescriptor == NULL,
+-                 "Unable to find descriptor field in java.io.FileDescriptor");
+ 
+     return JNI_TRUE;
+ }
+diff --git a/jni/share/userdict.cpp b/jni/share/userdict.cpp
+index 2843141..0eac1de 100644
+--- a/jni/share/userdict.cpp
++++ b/jni/share/userdict.cpp
+@@ -20,7 +20,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <cutils/log.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index c00ba71616..129ae2352a 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.keepassdroid.com/
 Source Code:http://github.com/bpellin/keepassdroid
-Issue Tracker:http://code.google.com/p/keepassdroid/issues/list
+Issue Tracker:http://code.google.com/p/keepassdroid/issues
 Donate:http://www.keepassdroid.com/
 
 Auto Name:KeePassDroid
diff --git a/metadata/com.android.launcher3.txt b/metadata/com.android.launcher3.txt
new file mode 100644
index 0000000000..dc0ab55f0c
--- /dev/null
+++ b/metadata/com.android.launcher3.txt
@@ -0,0 +1,33 @@
+Category:System
+License:Apache2
+Source Code:https://android.googlesource.com/platform/packages/apps/Launcher3/+/
+Issue Tracker:http://code.google.com/p/android/issues
+
+Summary:Home screen
+Description:
+Android 4.4 homescreen from AOSP, patched to enable installation on 4.1.
+Backup of configuration to Google account is removed.
+.
+
+Repo Type:git
+Repo:https://android.googlesource.com/platform/packages/apps/Launcher3
+
+Build:1.0,1
+    commit=android-4.4_r1.2
+    extlibs=android/android-support-v4.jar
+    patch=manifest-minsdk_1.patch
+    init=sed -i '/LauncherBackup/d' src/com/android/launcher3/LauncherProvider.java && \
+             rm src/com/android/launcher3/LauncherBackup* && \
+             echo -e 'target=android-19\nproguard.config=$$SDK$$/tools/proguard/proguard-android.txt:proguard.flags' \
+              >  project.properties
+
+Maintainer Notes:
+Possible improvements: https://github.com/bvermeule/Launcher3/commits/master 
+https://github.com/MuddPuddle/packages_apps_Launcher3
+I tried to build the protos but failed, hence the forced removal of backup.
+.
+
+Update Check Mode:None
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/com.android.launcher3/manifest-minsdk_1.patch b/metadata/com.android.launcher3/manifest-minsdk_1.patch
new file mode 100644
index 0000000000..e354451dba
--- /dev/null
+++ b/metadata/com.android.launcher3/manifest-minsdk_1.patch
@@ -0,0 +1,20 @@
+diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+index 901b638..a85f6b1 100644
+--- a/AndroidManifest.xml
++++ b/AndroidManifest.xml
+@@ -19,7 +19,14 @@
+ -->
+ <manifest
+     xmlns:android="http://schemas.android.com/apk/res/android"
+-    package="com.android.launcher3">
++    package="com.android.launcher3"
++	android:versionCode="1"
++	android:versionName="1.0" >
++
++	<uses-sdk
++		android:minSdkVersion="16"
++		android:targetSdkVersion="19"/>
++
+ 
+     <permission
+         android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
diff --git a/metadata/com.android.music.txt b/metadata/com.android.music.txt
index 9518def6b9..feff7e69e8 100644
--- a/metadata/com.android.music.txt
+++ b/metadata/com.android.music.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:
 Source Code:https://android.googlesource.com/platform/packages/apps/Music
-Issue Tracker:https://code.google.com/p/android/issues/list
+Issue Tracker:https://code.google.com/p/android/issues
 
 Auto Name:Music
 Summary:The stock audio player
diff --git a/metadata/com.android.quake.txt b/metadata/com.android.quake.txt
index 1d11752568..38324b916e 100644
--- a/metadata/com.android.quake.txt
+++ b/metadata/com.android.quake.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/glesquake/
-Source Code:https://code.google.com/p/glesquake/source/checkout
-Issue Tracker:https://code.google.com/p/glesquake/issues/list
+Source Code:https://code.google.com/p/glesquake/source
+Issue Tracker:https://code.google.com/p/glesquake/issues
 
 Auto Name:Quake
 Summary:Quake 1 for Android
diff --git a/metadata/com.android.shellms.txt b/metadata/com.android.shellms.txt
index a066114518..79d55c0cf8 100644
--- a/metadata/com.android.shellms.txt
+++ b/metadata/com.android.shellms.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:https://github.com/try2codesecure/ShellMS
-Source Code:https://github.com/try2codesecure/ShellMS/blob/master/src/com/android/shellms/sendSMS.java
+Source Code:https://github.com/try2codesecure/ShellMS
 Issue Tracker:https://github.com/try2codesecure/ShellMS/issues
 
 Auto Name:ShellMS
@@ -16,11 +16,20 @@ your computer.
 Repo Type:git
 Repo:git://github.com/try2codesecure/ShellMS.git
 
-Build Version:1.0,1,627f2a,init=rm -rf bin gen
-Build Version:1.1,2,v1.1,init=rm -rf bin gen
+Build:1.0,1
+    commit=627f2a
+    init=rm -rf bin gen
+
+Build:1.1,2
+    commit=v1.1
+    init=rm -rf bin gen
+
+Build:1.2,3
+    commit=v1.2
+    init=rm -rf bin gen
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
+Current Version:1.2
+Current Version Code:3
 
diff --git a/metadata/com.android2.calculator3.txt b/metadata/com.android2.calculator3.txt
index b54135e530..a6bdf7f600 100644
--- a/metadata/com.android2.calculator3.txt
+++ b/metadata/com.android2.calculator3.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/Xlythe/android_packages_apps_Calculator
 Source Code:https://github.com/Xlythe/android_packages_apps_Calculator
diff --git a/metadata/com.androidemu.gba.txt b/metadata/com.androidemu.gba.txt
index 41bf79a5d9..087def2e73 100644
--- a/metadata/com.androidemu.gba.txt
+++ b/metadata/com.androidemu.gba.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://gameboid.sf.net
 Source Code:http://sf.net/p/gameboid/code/
@@ -9,12 +9,21 @@ Summary:Nintendo Gameboy Advance emulator
 Description:
 This project is based on sources published by original GameBoid developer,
 who in turn used code of gpSP.
+
+To run this, you need a non-free BIOS file, which must be obtained
+elsewhere.
 .
 
 Repo Type:git
 Repo:git://git.code.sf.net/p/gameboid/code
 
-Build Version:1.3.2,6,1.3.2,subdir=GameBoid,buildjni=yes,submodules=yes,target=android-15,patch=target_api_10.diff
+Build:1.3.2,6
+    commit=1.3.2
+    subdir=GameBoid
+    submodules=yes
+    target=android-15
+    patch=target_api_10.diff
+    buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.androidemu.gbc.txt b/metadata/com.androidemu.gbc.txt
index ff96eb84cf..42d726b01b 100644
--- a/metadata/com.androidemu.gbc.txt
+++ b/metadata/com.androidemu.gbc.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://gbcoid.sf.net
 Source Code:http://sf.net/p/gbcoid/code/
diff --git a/metadata/com.androidemu.nes.txt b/metadata/com.androidemu.nes.txt
index e5923daf74..3253aba0ab 100644
--- a/metadata/com.androidemu.nes.txt
+++ b/metadata/com.androidemu.nes.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://nesoid.sf.net
 Source Code:http://sf.net/p/nesoid/code/
diff --git a/metadata/com.androidemu.snes.txt b/metadata/com.androidemu.snes.txt
index 4b068aec97..93fd2ec125 100644
--- a/metadata/com.androidemu.snes.txt
+++ b/metadata/com.androidemu.snes.txt
@@ -1,4 +1,5 @@
-Category:Games
+Disabled:Non-free license
+Categories:Games
 License:Unknown
 Web Site:https://github.com/Pretz/SNesoid/
 Source Code:https://github.com/Pretz/SNesoid
diff --git a/metadata/com.androsz.electricsleepbeta.txt b/metadata/com.androsz.electricsleepbeta.txt
index b7cd1c4f37..ffc94cff9f 100644
--- a/metadata/com.androsz.electricsleepbeta.txt
+++ b/metadata/com.androsz.electricsleepbeta.txt
@@ -1,4 +1,5 @@
-Category:Science & Education
+AntiFeatures:UpstreamNonFree
+Categories:Science & Education
 License:Apache2
 Web Site:https://github.com/jondwillis/ElectricSleep
 Source Code:https://github.com/jondwillis/ElectricSleep
@@ -32,8 +33,7 @@ bindir=target
 
 Auto Update Mode:None
 #Tags are for development
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Static
 Current Version:1.0
 Current Version Code:18
 
diff --git a/metadata/com.androzic.txt b/metadata/com.androzic.txt
index 1f00df03af..b8599e2c34 100644
--- a/metadata/com.androzic.txt
+++ b/metadata/com.androzic.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://androzic.com
 Source Code:https://github.com/andreynovikov/Androzic
diff --git a/metadata/com.andybotting.tramhunter.txt b/metadata/com.andybotting.tramhunter.txt
index 1631d2f0b3..921de9d496 100644
--- a/metadata/com.andybotting.tramhunter.txt
+++ b/metadata/com.andybotting.tramhunter.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://tramhunter.andybotting.com
 Source Code:https://github.com/andybotting/tramhunter
diff --git a/metadata/com.angrydoughnuts.android.alarmclock.txt b/metadata/com.angrydoughnuts.android.alarmclock.txt
index 12d6601d2d..b6a771e963 100644
--- a/metadata/com.angrydoughnuts.android.alarmclock.txt
+++ b/metadata/com.angrydoughnuts.android.alarmclock.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://code.google.com/p/kraigsandroid/
-Source Code:https://code.google.com/p/kraigsandroid/source/checkout
-Issue Tracker:https://code.google.com/p/kraigsandroid/issues/list
+Source Code:https://code.google.com/p/kraigsandroid/source
+Issue Tracker:https://code.google.com/p/kraigsandroid/issues
 
 Auto Name:Alarm Klock
 Summary:An alarm clock
@@ -16,14 +16,19 @@ Description:
 * Localizations: it, nl, pt, de, sr, hr, fr, es
 .
 
-Repo Type:svn
-Repo:http://kraigsandroid.googlecode.com/svn/tags/
+Repo Type:git
+Repo:https://code.google.com/p/kraigsandroid/
 
-Build Version:1.7,8,378
+Build:1.7,8
+    commit=alarmclock-1.7
+    subdir=android/alarmclock
 
-Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.7
-Current Version Code:8
+Build:1.9,10
+    commit=alarmclock-1.9
+    subdir=android/alarmclock
+
+Auto Update Mode:Version alarmclock-%v
+Update Check Mode:Tags
+Current Version:1.9
+Current Version Code:10
 
diff --git a/metadata/com.anoshenko.android.mahjongg.txt b/metadata/com.anoshenko.android.mahjongg.txt
index 4e50355539..7befc5f189 100644
--- a/metadata/com.anoshenko.android.mahjongg.txt
+++ b/metadata/com.anoshenko.android.mahjongg.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/mahjonggbuilder/
-Source Code:http://code.google.com/p/mahjonggbuilder/source/checkout
-Issue Tracker:http://code.google.com/p/mahjonggbuilder/issues/list
+Source Code:http://code.google.com/p/mahjonggbuilder/source
+Issue Tracker:http://code.google.com/p/mahjonggbuilder/issues
 
 Auto Name:Mahjongg Builder
 Summary:Solitaire games
@@ -15,13 +15,12 @@ The built-in layout editor allows creation of new game layouts.
 .
 
 Repo Type:git-svn
-Repo:http://mahjonggbuilder.googlecode.com/svn/trunk/
+Repo:http://mahjonggbuilder.googlecode.com/svn/trunk/Android
 
-Build Version:1.4.4,14,15,subdir=Android
+Build Version:1.4.4,14,15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.4
 Current Version Code:14
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.SSH.txt b/metadata/com.anysoftkeyboard.languagepack.SSH.txt
index eff9b62fa6..b91ad07102 100644
--- a/metadata/com.anysoftkeyboard.languagepack.SSH.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.SSH.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/pi3ch/ssh_anysoftkeyboard
 Source Code:https://github.com/pi3ch/ssh_anysoftkeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.catalan.txt b/metadata/com.anysoftkeyboard.languagepack.catalan.txt
index 385e7a6ada..00e340a0c8 100644
--- a/metadata/com.anysoftkeyboard.languagepack.catalan.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.catalan.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Catalan
 
 Build Version:20110220,3,1560,patch=xml.patch,\
@@ -29,7 +29,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/ca.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20110220
 Current Version Code:3
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.danish.txt b/metadata/com.anysoftkeyboard.languagepack.danish.txt
index 473c408f85..40aba1de08 100644
--- a/metadata/com.anysoftkeyboard.languagepack.danish.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.danish.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Danish
@@ -17,7 +17,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Danish
 
 Build Version:20100614,2,1081,patch=xml.patch,\
@@ -28,7 +28,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/da.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20100614
 Current Version Code:2
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.esperanto.txt b/metadata/com.anysoftkeyboard.languagepack.esperanto.txt
index 65461ea8dc..dcdbc96f39 100644
--- a/metadata/com.anysoftkeyboard.languagepack.esperanto.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.esperanto.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Esperanto
@@ -17,7 +17,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Esperanto
 
 Build Version:20100613,2,1082,patch=xml.patch,\
@@ -28,7 +28,7 @@ mkdir -p dict/ res/raw/ && gunzip -c libs/eo.xml.gz > dict/words.xml && rm -rf a
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20100613
 Current Version Code:2
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.french_xlarge.txt b/metadata/com.anysoftkeyboard.languagepack.french_xlarge.txt
index a094ab98ae..8e6480131c 100644
--- a/metadata/com.anysoftkeyboard.languagepack.french_xlarge.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.french_xlarge.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/FrenchXLarge
@@ -21,7 +21,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/FrenchXLarge
 
 Build Version:20111029,1,2019,init=rm -rf bin/ gen/,update=force,\
@@ -33,7 +33,7 @@ wget http://softkeyboard.googlecode.com/svn/trunk/DictionaryTools/xml/fr_xlarge.
 -O dict/words.xml,build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20111029
 Current Version Code:1
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt b/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
index ec82301f3d..c359696537 100644
--- a/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.georgian.fdroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/Stichoza
 Source Code:https://github.com/Stichoza/AnySoftKeyboardLanguagePackGeorgian
diff --git a/metadata/com.anysoftkeyboard.languagepack.greek.txt b/metadata/com.anysoftkeyboard.languagepack.greek.txt
index 789bedcded..b9fc1b7115 100644
--- a/metadata/com.anysoftkeyboard.languagepack.greek.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.greek.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Greek
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Greek
 
 Build Version:20110717,3,1815,patch=xml.patch,\
@@ -29,7 +29,7 @@ mkdir -p dict/ res/raw/ && rm -rf assets/ && mv libs/gr.xml dict/words.xml,\
 build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20110717
 Current Version Code:3
 
diff --git a/metadata/com.anysoftkeyboard.languagepack.hebrew_large.txt b/metadata/com.anysoftkeyboard.languagepack.hebrew_large.txt
index d7f499ec3c..734150ae55 100644
--- a/metadata/com.anysoftkeyboard.languagepack.hebrew_large.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.hebrew_large.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPL
 Web Site:https://github.com/AnySoftKeyboard/LanguagePack
 Source Code:https://github.com/AnySoftKeyboard/LanguagePack
diff --git a/metadata/com.anysoftkeyboard.languagepack.hungarian.txt b/metadata/com.anysoftkeyboard.languagepack.hungarian.txt
index 7b901e8430..45e3453dda 100644
--- a/metadata/com.anysoftkeyboard.languagepack.hungarian.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.hungarian.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPL/MPL
 Web Site:
 Source Code:https://github.com/rhornig/anysoftkeyboard-hungarian
@@ -23,23 +23,41 @@ the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 Repo Type:git
 Repo:https://github.com/rhornig/anysoftkeyboard-hungarian
 
-Build Version:20120208,12,v20120208,\
-patch=add-icon.patch;dictionaries.patch,\
-srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496,\
-prebuild=echo "android.library.reference.1=$$AnySoftKeyboard-API$$" >> project.properties && \
-         mkdir -p res/raw/ dict/ && mv dic/hu_HU-1.6.1.xml dict/words.xml && \
-         rm -rf assets/ dic/,\
-build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
-Build Version:20130712,15,05b2303fb,\
-patch=dictionaries.patch,\
-srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496,\
-prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-         mkdir -p res/raw/ dict/ && mv dic/hu_HU-1.6.1.xml dict/words.xml && \
-         rm -rf assets/ dic/,\
-build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
+Build:20120208,12
+    commit=v20120208
+    srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496
+    patch=add-icon.patch;dictionaries.patch
+    prebuild=echo "android.library.reference.1=$$AnySoftKeyboard-API$$" >> project.properties && \
+        mkdir -p res/raw/ dict/ && \
+        mv dic/hu_HU-1.6.1.xml dict/words.xml && \
+        rm -rf assets/ dic/
+    build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
+
+Build:20130712,15
+    commit=05b2303fb
+    srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496
+    patch=dictionaries.patch
+    prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        mkdir -p res/raw/ dict/ && \
+        mv dic/hu_HU-1.6.1.xml dict/words.xml && \
+        rm -rf assets/ dic/
+    build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
+
+Build:20131020,16
+    commit=v20131020
+    srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496
+    patch=dictionaries.patch
+    prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        mkdir -p res/raw/ dict/ && \
+        mv dic/hu_HU-1.6.1.xml dict/words.xml && \
+        rm -rf assets/ dic/
+    build=java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
+
+Maintainer Notes:
+Tags not always reliable.
+.
 
 Auto Update Mode:None
-# tags behind
 Update Check Mode:RepoManifest
 Current Version:20131020
 Current Version Code:16
diff --git a/metadata/com.anysoftkeyboard.languagepack.malayalam.txt b/metadata/com.anysoftkeyboard.languagepack.malayalam.txt
index 36cc0650a5..53ced3f9ab 100644
--- a/metadata/com.anysoftkeyboard.languagepack.malayalam.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.malayalam.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://gitorious.org/~psuresh
 Source Code:https://gitorious.org/amalaki
diff --git a/metadata/com.anysoftkeyboard.languagepack.pali.txt b/metadata/com.anysoftkeyboard.languagepack.pali.txt
index c5e1aa9973..fb9f2f2802 100644
--- a/metadata/com.anysoftkeyboard.languagepack.pali.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.pali.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/yuttadhammo
 Source Code:https://github.com/yuttadhammo/ask-pali-keyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.persian.txt b/metadata/com.anysoftkeyboard.languagepack.persian.txt
index aec3f76e42..eade1d1943 100644
--- a/metadata/com.anysoftkeyboard.languagepack.persian.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.persian.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.pedramhayati.com/2011/05/15/persianfarsi-language-for-android
 Source Code:https://github.com/pi3ch/persian_anysoftkeyboard
diff --git a/metadata/com.anysoftkeyboard.languagepack.russian2.txt b/metadata/com.anysoftkeyboard.languagepack.russian2.txt
index bb7b1e9d5a..b9b37642c6 100644
--- a/metadata/com.anysoftkeyboard.languagepack.russian2.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.russian2.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Unknown
 Web Site:https://github.com/pelya/AnySoftKeyboard-LanguagePack-Russian
 Source Code:https://github.com/pelya/AnySoftKeyboard-LanguagePack-Russian
diff --git a/metadata/com.anysoftkeyboard.languagepack.spain.txt b/metadata/com.anysoftkeyboard.languagepack.spain.txt
index 761a7bc3b9..06a0218834 100644
--- a/metadata/com.anysoftkeyboard.languagepack.spain.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.spain.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GNUFDL/CCBYSA
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
@@ -18,7 +18,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboards menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Spain
 
 Build Version:20110717-smaller,2,1813,forceversion=yes,forcevercode=yes,\
diff --git a/metadata/com.anysoftkeyboard.languagepack.ukrainian.txt b/metadata/com.anysoftkeyboard.languagepack.ukrainian.txt
index 8c2cc41d14..780cebb1fb 100644
--- a/metadata/com.anysoftkeyboard.languagepack.ukrainian.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.ukrainian.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GNUFDL
 Web Site:
 Source Code:https://github.com/AnySoftKeyboard/LanguagePack
diff --git a/metadata/com.anysoftkeyboard.theme.classic_pc.txt b/metadata/com.anysoftkeyboard.theme.classic_pc.txt
index 0318aea003..dbf51e0c76 100644
--- a/metadata/com.anysoftkeyboard.theme.classic_pc.txt
+++ b/metadata/com.anysoftkeyboard.theme.classic_pc.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/Themes/ClassicPC
@@ -15,7 +15,7 @@ Install [[com.menny.android.anysoftkeyboard]] first, then select
 the desired layout from AnySoftKeyboard's Settings->Keyboard themes menu.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/Themes/ClassicPC
 
 Build Version:1.0.1-201200304,2,2255,\
@@ -24,8 +24,7 @@ sed -i 's@\(reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
 sed -i '/key/d' project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1-201200304
 Current Version Code:2
 
diff --git a/metadata/com.aokp.backup.txt b/metadata/com.aokp.backup.txt
index 7ecc59e6be..2fc5a8f337 100644
--- a/metadata/com.aokp.backup.txt
+++ b/metadata/com.aokp.backup.txt
@@ -1,5 +1,5 @@
 Disabled:Not much chance of keeping it updated
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/romanbb/AOKP_Backup
 Source Code:https://github.com/romanbb/AOKP_Backup
diff --git a/metadata/com.app2go.sudokufree.txt b/metadata/com.app2go.sudokufree.txt
index be49042f7e..71a7089055 100644
--- a/metadata/com.app2go.sudokufree.txt
+++ b/metadata/com.app2go.sudokufree.txt
@@ -1,8 +1,9 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:GPLv3
 Web Site:http://www.1gravity.com/
-Source Code:http://code.google.com/p/sudoku-pro-android/source/list
-Issue Tracker:http://code.google.com/p/sudoku-pro-android/issues/list
+Source Code:http://code.google.com/p/sudoku-pro-android/source
+Issue Tracker:http://code.google.com/p/sudoku-pro-android/issues
 
 Auto Name:Sudoku Free
 Summary:Numerical puzzle game
diff --git a/metadata/com.appengine.paranoid_android.lost.txt b/metadata/com.appengine.paranoid_android.lost.txt
index d67b4d669e..c8de0d85ea 100644
--- a/metadata/com.appengine.paranoid_android.lost.txt
+++ b/metadata/com.appengine.paranoid_android.lost.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:LGPL
 Web Site:https://sites.google.com/site/paranoidandroidproject/ContactOwner
-Source Code:https://code.google.com/p/contactowner/source/browse/
-Issue Tracker:https://code.google.com/p/contactowner/issues/list
+Source Code:https://code.google.com/p/contactowner/source
+Issue Tracker:https://code.google.com/p/contactowner/issues
 
 Auto Name:Contact Owner
 Summary:Contact info on lock screen
diff --git a/metadata/com.aripuca.tracker.txt b/metadata/com.aripuca.tracker.txt
index 06b50efdbe..47a7e82300 100644
--- a/metadata/com.aripuca.tracker.txt
+++ b/metadata/com.aripuca.tracker.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://code.google.com/p/aripuca-tracker
-Source Code:http://code.google.com/p/aripuca-tracker/source/checkout
-Issue Tracker:http://code.google.com/p/aripuca-tracker/issues/list
+Source Code:http://code.google.com/p/aripuca-tracker/source
+Issue Tracker:http://code.google.com/p/aripuca-tracker/issues
 
 Auto Name:Aripuca GPS Tracker
 Summary:GPS tracking
diff --git a/metadata/com.ariwilson.seismowallpaper.txt b/metadata/com.ariwilson.seismowallpaper.txt
new file mode 100644
index 0000000000..0bf761fad8
--- /dev/null
+++ b/metadata/com.ariwilson.seismowallpaper.txt
@@ -0,0 +1,26 @@
+Categories:Wallpaper
+License:GPLv3
+Web Site:http://code.google.com/p/ariwilson
+Source Code:http://code.google.com/p/ariwilson/source
+Issue Tracker:http://code.google.com/p/ariwilson/issues
+
+Auto Name:Seismo Wallpaper
+Summary:Live wallpaper
+Description:
+A live wallpaper that measures anything that vibrates, shakes or moves.
+Seismo Wallpaper uses your device’s accelerometer to measure movements 
+on any axis with/without noise.
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/ariwilson/
+
+Build:1.02,2
+    commit=SeismoWallpaper 1.02
+    subdir=SeismoWallpaper
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.02
+Current Version Code:2
+
diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt
index 4c063d09c7..bf5ca8f0a9 100644
--- a/metadata/com.artifex.mupdfdemo.txt
+++ b/metadata/com.artifex.mupdfdemo.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:AGPLv3+
 Web Site:http://mupdf.com/
 Source Code:http://git.ghostscript.com/?p=mupdf.git;a=summary
diff --git a/metadata/com.as.anagramsolver.txt b/metadata/com.as.anagramsolver.txt
index 03cdf5f05c..827c36a1c0 100644
--- a/metadata/com.as.anagramsolver.txt
+++ b/metadata/com.as.anagramsolver.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:https://github.com/uberspot/AnagramSolver
 Source Code:https://github.com/uberspot/AnagramSolver
@@ -18,13 +18,51 @@ definition online.
 Repo Type:git
 Repo:https://github.com/uberspot/AnagramSolver.git
 
-Build Version:1.9,10,1801cd4610c12dbf17,\
-srclibs=ActionBarSherlock@4.4.0,prebuild=\
-	echo 'android.library.reference.1=$$ActionBarSherlock$$' >> project.properties &&\
-	cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+Build:1.9,10
+    commit=1801cd4610c12dbf17
+    srclibs=ActionBarSherlock@4.4.0
+    prebuild=echo 'android.library.reference.1=$$ActionBarSherlock$$' >> project.properties &&	cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:2.0,11
+    commit=e183274989
+    init=sed -i 's%git@github.com:%https://github.com/%' .gitmodules && \
+        sed -i 's%git@github.com:%https://github.com/%' .git/config && \
+        echo 'android.library.reference.1=external/actionbarsherlock/actionbarsherlock' >> project.properties && \
+        echo 'android.library.reference.2=external/changelog/library' >>project.properties && \
+        echo 'android.library.reference.3=external/storageutils' >>project.properties && \
+        git submodule init && \
+        git submodule update
+
+Build:2.05,12
+    commit=c3c48c2e
+    init=sed -i 's%git@github.com:%https://github.com/%' .gitmodules && \
+        sed -i 's%git@github.com:%https://github.com/%' .git/config && \
+        echo 'android.library.reference.1=external/actionbarsherlock/actionbarsherlock' >> project.properties && \
+        echo 'android.library.reference.2=external/changelog/library' >>project.properties && \
+        echo 'android.library.reference.3=external/storageutils' >>project.properties && \
+        git submodule init && \
+        git submodule update
+
+Build:2.1,13
+    commit=7a6ebadac48
+    init=sed -i 's%git@github.com:%https://github.com/%' .gitmodules && \
+        sed -i 's%git@github.com:%https://github.com/%' .git/config && \
+        echo 'android.library.reference.1=external/actionbarsherlock/actionbarsherlock' >> project.properties && \
+        echo 'android.library.reference.2=external/changelog/library' >>project.properties && \
+        echo 'android.library.reference.3=external/storageutils' >>project.properties && \
+        git submodule update --init
+
+Maintainer Notes:
+No tags, and historically no clear marking of release points in commit comments.
+Look out for binary apk changing in source repo though.
+
+Uses git submodules for dependencies after 2.0, but the project.properties
+indicates that the developer is not actually using them, so beware of
+versioning discrepancies for those.
+.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.9
-Current Version Code:10
+Current Version:2.11
+Current Version Code:14
 
diff --git a/metadata/com.aselalee.trainschedule.txt b/metadata/com.aselalee.trainschedule.txt
index afb8739423..1b0e22adca 100644
--- a/metadata/com.aselalee.trainschedule.txt
+++ b/metadata/com.aselalee.trainschedule.txt
@@ -1,7 +1,8 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/sl-train-schedule
-Source Code:http://code.google.com/p/sl-train-schedule/source/list
+Source Code:http://code.google.com/p/sl-train-schedule/source
 Issue Tracker:
 
 Auto Name:Train Schedule
diff --git a/metadata/com.asksven.betterbatterystats.txt b/metadata/com.asksven.betterbatterystats.txt
index a98210990d..f2503e1c96 100644
--- a/metadata/com.asksven.betterbatterystats.txt
+++ b/metadata/com.asksven.betterbatterystats.txt
@@ -1,4 +1,5 @@
-Category:System
+AntiFeatures:UpstreamNonFree
+Categories:System
 # All source files and jars but no licence in README
 License:Apache2
 Web Site:http://asksven.tumblr.com
@@ -31,30 +32,42 @@ Repo Type:git
 Repo:https://github.com/asksven/BetterBatteryStats.git
 
 # Need to patch out Locale because it causes build errors
-Build Version:1.11.0.0,28,v1.11.0.0,subdir=BetterBatteryStats,\
-srclibs=ActionBarSherlock@4.2.0;NoAnalytics@158a4a;Common-AskSven@7d71a6ba9a,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$Common-AskSven$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$NoAnalytics$$@' project.properties && \
-sed -i 's@\(reference.3=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i '75\,87d' AndroidManifest.xml && rm -rf libs/libGoogleAnalytics.jar \
-src/com/asksven/betterbatterystats/localeplugin *.apk
-Build Version:1.13.4.0,38,ef3df22ba,subdir=BetterBatteryStats,\
-srclibs=ActionBarSherlock@4.2.0;NoAnalytics@158a4a;Common-AskSven@b09bb8b6cd,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$Common-AskSven$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$NoAnalytics$$@' project.properties && \
-sed -i 's@\(reference.3=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i '104\,116d' AndroidManifest.xml && rm -rf libs/libGoogleAnalytics.jar \
-src/com/asksven/betterbatterystats/localeplugin
-Build Version:1.14.0.0,39,!missing part of Common-AskSven library v1.14.0.0,subdir=BetterBatteryStats,\
-srclibs=ActionBarSherlock@4.4.0;NoAnalytics@a63142b59;Common-AskSven@b09bb8b6cd,prebuild=\
-    echo "android.library.reference.1=$$Common-AskSven$$" >> project.properties && \
-    echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
-    echo "android.library.reference.3=$$ActionBarSherlock$$" >> project.properties && \
-    sed -i '106\,140d' AndroidManifest.xml && rm -rf libs/libGoogleAnalytics.jar \
-    src/com/asksven/betterbatterystats/localeplugin
+Build:1.11.0.0,28
+    commit=v1.11.0.0
+    subdir=BetterBatteryStats
+    srclibs=ActionBarSherlock@4.2.0;NoAnalytics@158a4a;Common-AskSven@7d71a6ba9a
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$Common-AskSven$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$NoAnalytics$$@' project.properties && \
+        sed -i 's@\(reference.3=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i '75,87d' AndroidManifest.xml && \
+        rm -rf libs/libGoogleAnalytics.jar src/com/asksven/betterbatterystats/localeplugin *.apk
+
+Build:1.13.4.0,38
+    commit=ef3df22ba
+    subdir=BetterBatteryStats
+    srclibs=ActionBarSherlock@4.2.0;NoAnalytics@158a4a;Common-AskSven@b09bb8b6cd
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$Common-AskSven$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$NoAnalytics$$@' project.properties && \
+        sed -i 's@\(reference.3=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i '104,116d' AndroidManifest.xml && \
+        rm -rf libs/libGoogleAnalytics.jar src/com/asksven/betterbatterystats/localeplugin
+
+Build:1.14.0.0,39
+    disable=missing part of Common-AskSven library v1.14.0.0
+    commit=unknown - see disabled
+    subdir=BetterBatteryStats
+    srclibs=ActionBarSherlock@4.4.0;NoAnalytics@a63142b59;Common-AskSven@b09bb8b6cd
+    prebuild=echo "android.library.reference.1=$$Common-AskSven$$" >> project.properties && \
+        echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
+        echo "android.library.reference.3=$$ActionBarSherlock$$" >> project.properties && \
+        sed -i '106,140d' AndroidManifest.xml && \
+        rm -rf libs/libGoogleAnalytics.jar     src/com/asksven/betterbatterystats/localeplugin
+
+Build:1.15.0.0_B1,40
+    disable=beta
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.14.0.0
-Current Version Code:39
+Current Version:1.15.0.0_B1
+Current Version Code:40
 
diff --git a/metadata/com.asksven.betterwifionoff.txt b/metadata/com.asksven.betterwifionoff.txt
new file mode 100644
index 0000000000..d145636666
--- /dev/null
+++ b/metadata/com.asksven.betterwifionoff.txt
@@ -0,0 +1,30 @@
+AntiFeatures:UpstreamNonFree
+Categories:System
+License:Apache2
+Web Site:http://asksven.tumblr.com
+Source Code:https://github.com/asksven/BetterWifiOnOff
+Issue Tracker:https://github.com/asksven/BetterWifiOnOff/issues
+
+Auto Name:Better Wifi on/off
+Summary:Manage the use of WiFi to save battery
+Description:
+Locale-API integration was removed to get it to build.
+Proprietary ad library was removed.
+.
+
+Repo Type:git
+Repo:https://github.com/asksven/BetterWifiOnOff.git
+
+Build:2.1.0.0,43
+    commit=v2.1.0.0
+    subdir=BetterWifiOnOff
+    rm=BetterWifiOnOff/libs/GoogleAdMobAdsSdk-6.4.1.jar;BetterWifiOnOff/src/com/asksven/betterwifionoff/localeplugin
+    srclibs=3:ActionBarSherlock@4.2.0;2:LocaleAPI@bc2d5a1;4:MobAdMob@2d5736;1:Common-AskSven@b09bb8b6cd
+    prebuild=sed -i '95,97d;113,115d' AndroidManifest.xml && \
+        sed -i '24d' src/com/asksven/betterwifionoff/SsidWhitelistPreference.java
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.1.0.0
+Current Version Code:43
+
diff --git a/metadata/com.ath0.rpn.txt b/metadata/com.ath0.rpn.txt
index 15772966c3..34395a192d 100644
--- a/metadata/com.ath0.rpn.txt
+++ b/metadata/com.ath0.rpn.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://meta.ath0.com/software/rpn/
 Source Code:https://github.com/lpar/RPN
diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt
index 23c4d25bd2..fe81a12b86 100644
--- a/metadata/com.axelby.podax.txt
+++ b/metadata/com.axelby.podax.txt
@@ -1,5 +1,4 @@
-AntiFeatures:Tracking
-Category:Multimedia
+Categories:Multimedia
 License:NewBSD
 Web Site:https://github.com/thasmin/Podax
 Source Code:https://github.com/thasmin/Podax
@@ -8,8 +7,7 @@ Issue Tracker:https://github.com/thasmin/Podax/issues
 Auto Name:Podax
 Summary:Podcast downloader and player
 Description:
-It automatically downloads new podcasts on an RSS feed, has a widget for easy control,
-and can import subscriptions from Google Reader.
+It automatically downloads new podcasts on an RSS feed and has a widget for easy control.
 
 Features include:
 * keeping a list of subscriptions
@@ -18,38 +16,92 @@ Features include:
 * two widgets for easy pausing and resuming
 * discover popular podcasts from other Podax listeners
 
-Anti-feature: Tracking. Statistics are sent by default, but they can easily
-be disabled in the Preferences.
+(note: some versions earlier than 6.02 had the Tracking
+antifeature, but versions from 6.02 onwards don't)
 .
 
 Repo Type:git
 Repo:git://github.com/thasmin/Podax.git
 
-# this force closes on my device
-#Build Version:1.3,9,e44055a50fe5f4457f17c70666e3683bd7818fc1,target=android-7
-#Build Version:2.0,10,7141fee3933a580556121a01c60da04e9f37f7ac,target=android-7
-#Build Version:2.1,11,ab60ff786c0e050c94979f4801330c4f226e26d7,target=android-7
-Build Version:2.11,12,13d0e30198d96b4cd7b1a87065a1b8cf3ed578f4,target=android-7
-Build Version:3.1,14,7843408a0960,target=android-14
-Build Version:3.2,15,6bed14c32963,target=android-14
-Build Version:3.3,16,606af2015873,target=android-14
-Build Version:3.5,18,62c2b93562b6,target=android-14
-Build Version:4.02,21,!e5da76325a5a build failure - submodules refer to deleted github repositories
-Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://github.com/thasmin/ViewPagerIndicator.git' into submodule path 'ViewPagerIndicator' failed
-Build Version:4.5,28,acb8477a,submodules=yes,update=.;ViewPagerIndicator/library;ActionBarSherlock/library
-Build Version:5.01,30,5.01,submodules=yes,update=.;ViewPagerIndicator/library;ActionBarSherlock/library
-Build Version:5.2,32,5.2,submodules=yes,update=.;ViewPagerIndicator/library;ActionBarSherlock/library
-Build Version:5.3,33,5.3,submodules=yes,target=android-16,\
-update=.;ViewPagerIndicator/library;ActionBarSherlock/library
-Build Version:5.6,36,5.6,submodules=yes,\
-update=.;ViewPagerIndicator/library;ActionBarSherlock/library;Riasel/library;drag-sort-listview,prebuild=\
-sed -i '/proguard/d' project.properties
-Build Version:5.8,38,5.8,submodules=yes,\
-update=.;ViewPagerIndicator/library;ActionBarSherlock/library;Riasel/library;drag-sort-listview,prebuild=\
-sed -i '/proguard/d' project.properties
+Build:2.11,12
+    commit=13d0e30198d96b4cd7b1a87065a1b8cf3ed578f4
+    target=android-7
+
+Build:3.1,14
+    commit=7843408a0960
+    target=android-14
+
+Build:3.2,15
+    commit=6bed14c32963
+    target=android-14
+
+Build:3.3,16
+    commit=606af2015873
+    target=android-14
+
+Build:3.5,18
+    commit=62c2b93562b6
+    target=android-14
+
+Build:4.5,28
+    commit=acb8477a
+    submodules=yes
+    update=.;ViewPagerIndicator/library;ActionBarSherlock/library
+
+Build:5.01,30
+    commit=5.01
+    submodules=yes
+    update=.;ViewPagerIndicator/library;ActionBarSherlock/library
+
+Build:5.2,32
+    commit=5.2
+    submodules=yes
+    update=.;ViewPagerIndicator/library;ActionBarSherlock/library
+
+Build:5.3,33
+    commit=5.3
+    submodules=yes
+    target=android-16
+    update=.;ViewPagerIndicator/library;ActionBarSherlock/library
+
+Build:5.6,36
+    disable=build fail
+    commit=5.6
+
+Build:5.8,38
+    commit=5.8
+    submodules=yes
+    update=.;ViewPagerIndicator/library;ActionBarSherlock/library;Riasel/library;drag-sort-listview
+    prebuild=sed -i '/proguard/d' project.properties
+
+# appcompat srclib will go soon
+Build:6.02,42
+    commit=6.02
+    submodules=yes
+    srclibs=appcompat@v7
+    prebuild=echo "android.library.reference.3=$$appcompat$$" >> project.properties && \
+        mkdir drag-sort-listview/library/libs/ && \
+        cp $$appcompat$$/libs/android-support-v4* drag-sort-listview/library/libs/ && \
+        sed -i '/proguard/d' project.properties
+
+Build:6.1.2,45
+    commit=6.1.2
+    gradle=yes
+
+Build:6.1.3,46
+    commit=6.1.3
+    gradle=yes
+
+Build:6.1.5,48
+    commit=6.1.5
+    gradle=yes
+
+Build:6.1.7,50
+    commit=6.1.7
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:5.8
-Current Version Code:38
+Current Version:6.1.7
+Current Version Code:50
 
diff --git a/metadata/com.banasiak.coinflip.txt b/metadata/com.banasiak.coinflip.txt
index 5a3bdfdf04..e3d896ed11 100644
--- a/metadata/com.banasiak.coinflip.txt
+++ b/metadata/com.banasiak.coinflip.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/banasiak/CoinFlip
 Source Code:https://github.com/banasiak/CoinFlip
@@ -13,16 +13,31 @@ See [[com.banasiak.coinflipext.example]] for extra coins.
 Repo Type:git
 Repo:https://github.com/banasiak/CoinFlip.git
 
-Build Version:5.1,25,f4d644
-Build Version:5.2,26,93e1497e40
-Build Version:5.2.1,27,4a154179
-Build Version:5.3,28,!skip this one
-Build Version:5.3.1,29,f5d0dfd
-Build Version:5.3.2,30,3de8a3025
+Build:5.1,25
+    commit=f4d644
+
+Build:5.2,26
+    commit=93e1497e40
+
+Build:5.2.1,27
+    commit=4a154179
+
+Build:5.3.1,29
+    commit=f5d0dfd
+
+Build:5.3.2,30
+    commit=3de8a3025
+
+Build:5.4,31
+    disable=missing drawables
+    commit=5756cefff048fa
+
+Build:5.4.1,32
+    disable=source still incomplete - see https://github.com/banasiak/CoinFlip/issues/3
+    commit=0e60aa436279
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:5.3.2
-Current Version Code:30
+Update Check Mode:RepoManifest
+Current Version:5.4.1
+Current Version Code:32
 
diff --git a/metadata/com.banasiak.coinflipext.example.txt b/metadata/com.banasiak.coinflipext.example.txt
index 1d10b372a8..12ba516300 100644
--- a/metadata/com.banasiak.coinflipext.example.txt
+++ b/metadata/com.banasiak.coinflipext.example.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/banasiak/CoinFlipExtExample
 Source Code:https://github.com/banasiak/CoinFlipExtExample
diff --git a/metadata/com.beem.project.beem.txt b/metadata/com.beem.project.beem.txt
index 8c0e3d05d5..3ce4e80bb9 100644
--- a/metadata/com.beem.project.beem.txt
+++ b/metadata/com.beem.project.beem.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://www.beem-project.com/
 Source Code:http://www.beem-project.com/projects/beem/repository
diff --git a/metadata/com.better.alarm.txt b/metadata/com.better.alarm.txt
index 0a5dd94d85..a374b42605 100644
--- a/metadata/com.better.alarm.txt
+++ b/metadata/com.better.alarm.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/yuriykulikov/AlarmClock
diff --git a/metadata/com.bigbluecup.android.launcher.txt b/metadata/com.bigbluecup.android.launcher.txt
index 6becdad8b6..7d2943bc44 100644
--- a/metadata/com.bigbluecup.android.launcher.txt
+++ b/metadata/com.bigbluecup.android.launcher.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://www.adventuregamestudio.co.uk/site/ags/
 Source Code:https://github.com/adventuregamestudio/ags
@@ -29,10 +29,22 @@ Status: BETA
 Repo Type:git
 Repo:git://github.com/adventuregamestudio/ags.git
 
-Build Version:3.3.0-beta,1,!wip v.3.3.0-beta,submodules=yes,init=git submodule foreach git checkout d6f13daef9,\
-subdir=Android/launcher_list,buildjni=../library,forceversion=yes,update=.;../library,target=android-16
+Build:3.3.0-beta,1
+    disable=lots of build errors
+    commit=v.3.3.0-beta
+    init=cd ../.. && find -iregex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
+	git submodule foreach git checkout d6f13daef9
+    build=cd ../buildlibs && find -name "*.sh" -exec chmod +x {} + && ./buildall.sh
+    patch=ndkr9.patch
+    subdir=Android/launcher_list
+    submodules=yes
+    target=android-17
+    update=.;../library
+    forceversion=yes
+    buildjni=../library
 
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:3.3.0-beta
 Current Version Code:1
+
diff --git a/metadata/com.bigbluecup.android.launcher/ndkr9.patch b/metadata/com.bigbluecup.android.launcher/ndkr9.patch
new file mode 100644
index 0000000000..76237603db
--- /dev/null
+++ b/metadata/com.bigbluecup.android.launcher/ndkr9.patch
@@ -0,0 +1,72 @@
+From fe3d87c86b830c5e6d7b7e990de5ec5ef68483e7 Mon Sep 17 00:00:00 2001
+From: jjsat <jjs@jjs.at>
+Date: Sun, 25 Aug 2013 11:39:02 +0200
+Subject: [PATCH] Android: Fix building with NDK r9.
+
+---
+ Android/library/jni/pe_jni.c        | 2 +-
+ Engine/platform/android/acpland.cpp | 6 +++---
+ Engine/platform/util/libc.c         | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Android/library/jni/pe_jni.c b/Android/library/jni/pe_jni.c
+index ac5b359..c24681b 100644
+--- a/Android/library/jni/pe_jni.c
++++ b/Android/library/jni/pe_jni.c
+@@ -13,7 +13,7 @@ void android_debug_printf(char* format, ...)
+   vsprintf(buffer, format, ap);
+   va_end(ap);
+ 
+-  __android_log_print(ANDROID_LOG_DEBUG, "Allegro", buffer);
++  __android_log_print(ANDROID_LOG_DEBUG, "Allegro", "%s", buffer);
+ }
+ 
+ int IsDataFile(version_info_t* version_info)
+diff --git a/Engine/platform/android/acpland.cpp b/Engine/platform/android/acpland.cpp
+index 3aa1668..244d595 100644
+--- a/Engine/platform/android/acpland.cpp
++++ b/Engine/platform/android/acpland.cpp
+@@ -675,7 +675,7 @@ void AGSAndroid::WriteDebugString(const char* texx, ...)
+     va_start(ap,texx);
+     vsprintf(&displbuf[5],texx,ap);
+     va_end(ap);
+-    __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
++    __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
+   }
+ }
+ 
+@@ -712,7 +712,7 @@ void AGSAndroid::DisplayAlert(const char *text, ...) {
+   JNIEnv* thread_env;
+   android_jni_vm->AttachCurrentThread(&thread_env, NULL);
+ 
+-  __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
++  __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
+ 
+   jstring java_string = thread_env->NewStringUTF(displbuf);
+   thread_env->CallVoidMethod(java_object, java_messageCallback, java_string);
+@@ -765,7 +765,7 @@ void AGSAndroid::WriteConsole(const char *text, ...) {
+   va_start(ap, text);
+   vsprintf(displbuf, text, ap);
+   va_end(ap);
+-  __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);  
++  __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);  
+ }
+ 
+ void AGSAndroid::ShutdownCDPlayer() {
+diff --git a/Engine/platform/util/libc.c b/Engine/platform/util/libc.c
+index e201d2b..e3820af 100644
+--- a/Engine/platform/util/libc.c
++++ b/Engine/platform/util/libc.c
+@@ -19,7 +19,7 @@
+ #include <string.h>
+ 
+ // Only a dummy. It is used in a function of alfont, but never called in AGS.
+-size_t malloc_usable_size(void* allocation)
++size_t malloc_usable_size(const void* allocation)
+ {
+   return 0;
+ }
+-- 
+1.8.4
+
+
diff --git a/metadata/com.blippex.app.txt b/metadata/com.blippex.app.txt
new file mode 100644
index 0000000000..e426755a57
--- /dev/null
+++ b/metadata/com.blippex.app.txt
@@ -0,0 +1,26 @@
+Categories:Internet
+License:MIT
+Web Site:https://www.blippex.org
+Source Code:https://github.com/blippex/blippex_android_app
+Issue Tracker:https://github.com/blippex/blippex_android_app/issues
+
+Auto Name:blippex
+Summary:Client for a search engine
+Description:
+Searches Blippex, a search engine which allow the community to rank 
+websites based on how long they spend there among other things.
+There are extensions for many or the desktop browsers.
+.
+
+Repo Type:git
+Repo:https://github.com/blippex/blippex_android_app.git
+
+Build:1.0.3,5
+    commit=a077c4dd93e026c4b
+    subdir=blippex
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.3
+Current Version Code:5
+
diff --git a/metadata/com.blntsoft.emailpopup.txt b/metadata/com.blntsoft.emailpopup.txt
new file mode 100644
index 0000000000..490ddf4da2
--- /dev/null
+++ b/metadata/com.blntsoft.emailpopup.txt
@@ -0,0 +1,29 @@
+AntiFeatures:UpstreamNonFree
+Categories:Office
+License:Apache2
+Web Site:
+Source Code:https://github.com/baolongnt/EmailPopup
+Issue Tracker:https://github.com/baolongnt/EmailPopup/issues
+
+Auto Name:Email Popup
+Summary:Display a popup for new mail
+Description:
+You can select how long the popup stays on & configure the app to filter out 
+emails so that only the important ones do popup.
+
+A proprietary crash reporting library was removed.
+.
+
+Repo Type:git
+Repo:https://github.com/baolongnt/EmailPopup.git
+
+Build:0.2.2,14
+    commit=0.2.2
+    rm=libs/crashlytics.jar;custom_rules.xml;tests
+    prebuild=find src -type f -print0 | xargs -0 sed -i '/Crashlytics/d'
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.2.2
+Current Version Code:14
+
diff --git a/metadata/com.blogspot.marioboehmer.nfcprofile.txt b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
index 460f6b9c29..98a4853026 100644
--- a/metadata/com.blogspot.marioboehmer.nfcprofile.txt
+++ b/metadata/com.blogspot.marioboehmer.nfcprofile.txt
@@ -1,4 +1,5 @@
-Category:System
+Disabled:Non-free license
+Categories:System
 License:CCBYNCSA3
 Web Site:http://marioboehmer.blogspot.com/2012/03/nfc-profile-version-21.html
 Source Code:https://github.com/MarioBoehmer/NFCProfile
diff --git a/metadata/com.blogspot.tonyatkins.freespeech.txt b/metadata/com.blogspot.tonyatkins.freespeech.txt
index c8ae5fb069..1cb0175e94 100644
--- a/metadata/com.blogspot.tonyatkins.freespeech.txt
+++ b/metadata/com.blogspot.tonyatkins.freespeech.txt
@@ -1,5 +1,5 @@
 AntiFeatures:Tracking
-Category:Science & Education
+Categories:Science & Education
 License:FreeBSD
 Web Site:
 Source Code:https://bitbucket.org/duhrer/free-speech-for-android
@@ -20,14 +20,33 @@ Anti-feature: Tracking. Crash reports are sent without interaction.
 Repo Type:hg
 Repo:https://bitbucket.org/duhrer/free-speech-for-android
 
-Build Version:1.17,117,freespeech-1.17,maven=yes,bindir=target,prebuild=\
-rm -rf target && sed -i '45 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
-Build Version:1.19,119,freespeech-1.19,forceversion=yes,forcevercode=yes,maven=yes,bindir=target
-Build Version:1.21,121,e293b4a,forceversion=yes,forcevercode=yes,maven=yes,bindir=target
-Build Version:1.23,123,!libs missing on maven central freespeech-1.23,maven=yes,bindir=target
+Build:1.17,117
+    commit=freespeech-1.17
+    maven=yes
+    prebuild=rm -rf target && \
+        sed -i '45 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
+    bindir=target
+
+Build:1.19,119
+    commit=freespeech-1.19
+    maven=yes
+    forceversion=yes
+    forcevercode=yes
+    bindir=target
+
+Build:1.21,121
+    commit=e293b4a
+    maven=yes
+    forceversion=yes
+    forcevercode=yes
+    bindir=target
+
+Build:1.24,124
+    commit=freespeech-1.24
+    maven=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.23
-Current Version Code:123
+Current Version:1.24
+Current Version Code:124
 
diff --git a/metadata/com.boardgamegeek.txt b/metadata/com.boardgamegeek.txt
index 3a581e5fee..c0795c01d4 100644
--- a/metadata/com.boardgamegeek.txt
+++ b/metadata/com.boardgamegeek.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/boardgamegeek/
-Source Code:https://code.google.com/p/boardgamegeek/source/list
-Issue Tracker:https://code.google.com/p/boardgamegeek/issues/list
+Source Code:https://code.google.com/p/boardgamegeek/source
+Issue Tracker:https://code.google.com/p/boardgamegeek/issues
 
 Auto Name:BoardGameGeek
 Summary:Search boardgame data
diff --git a/metadata/com.boombuler.games.shift.txt b/metadata/com.boombuler.games.shift.txt
index f42cabaa5b..8cb3b3586b 100644
--- a/metadata/com.boombuler.games.shift.txt
+++ b/metadata/com.boombuler.games.shift.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:https://github.com/boombuler/Shift
 Source Code:https://github.com/boombuler/Shift
@@ -8,10 +8,7 @@ Auto Name:Shift
 Summary:Eliminate the tiles
 Description:
 Shift is a small puzzle game for Android. It is a remake of a game
-for WindowsMobile devices. If you want to help me with this project just
-contact me...
-
-Hope you like it and thanks for reading this ;-)
+for WindowsMobile devices.
 .
 
 Repo Type:git
@@ -20,9 +17,7 @@ Repo:https://github.com/boombuler/Shift.git
 Build Version:1.0.1,101,5d7784b359
 
 Auto Update Mode:None
-#Not very good commit comments
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:101
 
diff --git a/metadata/com.boombuler.widgets.contacts.txt b/metadata/com.boombuler.widgets.contacts.txt
index 1d1c5b253c..b9239ccde7 100644
--- a/metadata/com.boombuler.widgets.contacts.txt
+++ b/metadata/com.boombuler.widgets.contacts.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:http://code.google.com/p/scrollablecontacts
-Source Code:http://code.google.com/p/scrollablecontacts/source/list
-Issue Tracker:http://code.google.com/p/scrollablecontacts/issues/list
+Source Code:http://code.google.com/p/scrollablecontacts/source
+Issue Tracker:http://code.google.com/p/scrollablecontacts/issues
 Donate:http://code.google.com/p/scrollablecontacts
 
 Auto Name:Contact Widget
@@ -17,10 +17,9 @@ Repo:http://scrollablecontacts.googlecode.com/svn/trunk/
 Build Version:1.0.2,102,129,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.0.3
-Current Version Code:103
+Update Check Mode:RepoManifest
+Current Version:1.0.2
+Current Version Code:102
 
 No Source Since:1.0.3
 
diff --git a/metadata/com.botbrew.basil.txt b/metadata/com.botbrew.basil.txt
index c59a230aab..a00e1e7b4e 100644
--- a/metadata/com.botbrew.basil.txt
+++ b/metadata/com.botbrew.basil.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPL
 Web Site:http://botbrew.com
 Source Code:https://github.com/jyio/botbrew-gui
diff --git a/metadata/com.bottleworks.dailymoney.txt b/metadata/com.bottleworks.dailymoney.txt
index 6e7fbf216f..cef12551ef 100644
--- a/metadata/com.bottleworks.dailymoney.txt
+++ b/metadata/com.bottleworks.dailymoney.txt
@@ -1,8 +1,9 @@
-Category:Office
+AntiFeatures:UpstreamNonFree
+Categories:Office
 License:GPL
 Web Site:https://code.google.com/p/daily-money/
 Source Code:https://github.com/dennischen/daily-money
-Issue Tracker:https://code.google.com/p/daily-money/issues/list
+Issue Tracker:https://code.google.com/p/daily-money/issues
 
 Auto Name:Daily Money
 Summary:Finance manager
@@ -26,8 +27,7 @@ echo "android.library.reference.1=$$NoAnalytics$$" >> ../dailymoney/project.prop
 sed -i '/android.permission.INTERNET/d' AndroidManifest.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.9.8-121107-freshly
 Current Version Code:2012110700
 
diff --git a/metadata/com.bretternst.URLazy.txt b/metadata/com.bretternst.URLazy.txt
new file mode 100644
index 0000000000..404f4b087a
--- /dev/null
+++ b/metadata/com.bretternst.URLazy.txt
@@ -0,0 +1,38 @@
+Categories:Development
+License:MIT
+Source Code:https://github.com/bretternst/urlazy
+Issue Tracker:https://github.com/bretternst/urlazy/issues
+
+Auto Name:URLazy
+Summary:Tool for web devlelopers
+Description:
+Eases the pain of entering long URLs into a bunch of test devices by finding 
+collections of URLs on the local network and allowing you to open them with a 
+single tap.
+You can serve links from a GUI app on your workstation or from a Ruby script 
+on a local development server (source code in same repo).
+
+URLazy finds this list with no configuration required, provided you are 
+connected to your network via Wi-Fi. 
+This makes it super easy to test your projects on real devices without 
+manually setting up bookmarks or entering URLs.
+
+This is a better alternative to bookmarks or centralized index pages because 
+new devices require no set-up and you don't have to edit URLs every time your 
+environment changes--or if you take your work home.
+URLazy uses multicast UDP to find collections of links. 
+If your network administrator enables it, this can even work across a corporate WAN.
+.
+
+Repo Type:git
+Repo:https://github.com/bretternst/urlazy.git
+
+Build:1.0a,2
+    commit=2fe2293df9b49b3
+    subdir=src/Android
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0a
+Current Version Code:2
+
diff --git a/metadata/com.brewcrewfoo.performance.txt b/metadata/com.brewcrewfoo.performance.txt
new file mode 100644
index 0000000000..ee230eb818
--- /dev/null
+++ b/metadata/com.brewcrewfoo.performance.txt
@@ -0,0 +1,43 @@
+Category:System
+License:GPLv3
+Web Site:http://forum.xda-developers.com/showthread.php?t=2401988
+Source Code:https://github.com/erik96/android_packages_apps_PerformanceControl
+Issue Tracker:http://forum.xda-developers.com/devdb/project/?id=600#bugReporter
+Donate:http://forum.xda-developers.com/donatetome.php?u=4674443
+
+Summary:System configuration
+Description:
+'''N.B''' Sqlite functions removed since 2.1.8.
+
+*Change CPU Governor, I/O Scheduler and Clock Speed
+*Battery information + Fast Charge setting + Battery Life eXtender setting
+*Change Voltages Assigned to each CPU frequency
+*Customize MinFree Task Killer (set the amount of RAM the minfree taskiller will keep)
+*zRam (RAM compression)
+*Customize SD read-ahead
+*VM Settings such as: Dirty Ratio, Dynamic Fsync, Backlight timeout
+*Integrated CPU Spy
+*Linux Kernel, CPU, Memory informations
+*Misc. Tools: Custom shell command, Wipe cache+dalvik cache, build.prop editor etc.
+
+Requires root, busybox and a custom ROM.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/erik96/android_packages_apps_PerformanceControl
+
+Build Version:2.1.3,3,e2b54691bda8a74,forcevercode=yes
+Build Version:2.1.8,4,e0ebe71ee3ccd,prebuild=rm assets/sq*
+
+Maintainer Notes:
+May be possible to build sqlite
+quite hard to figure out as vercodes don't always change; see website
+only temoporary: Update Check Mode:RepoManifest/jb2
+.
+
+Update Check Mode:None
+Current Version:2.1.8
+Current Version Code:4
+
diff --git a/metadata/com.bri1.soundbored.txt b/metadata/com.bri1.soundbored.txt
new file mode 100644
index 0000000000..4e141871b4
--- /dev/null
+++ b/metadata/com.bri1.soundbored.txt
@@ -0,0 +1,26 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:
+Source Code:https://github.com/nezvadovitz/soundbored
+Issue Tracker:https://github.com/nezvadovitz/soundbored/issues
+
+Auto Name:Instant Sound Effects
+Summary:Comedy soundboard
+Description:
+Play various sound effects, each indicating that you're bored;
+including rim-shots and crickets. 
+In other words, it's a sound-bored (''trombone sound'').
+.
+
+Repo Type:git
+Repo:https://github.com/nezvadovitz/soundbored.git
+
+Build:2.0,3
+    commit=42ed
+    extlibs=android/android-support-v4.jar
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.0
+Current Version Code:3
+
diff --git a/metadata/com.brianco.colorclock.txt b/metadata/com.brianco.colorclock.txt
index 043b2a096d..1977bf392b 100644
--- a/metadata/com.brianco.colorclock.txt
+++ b/metadata/com.brianco.colorclock.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv3+
 Source Code:https://github.com/NightlyNexus/Color-Clock
 Issue Tracker:https://github.com/NightlyNexus/Color-Clock/issues
diff --git a/metadata/com.brockoli.android.hsdroid.txt b/metadata/com.brockoli.android.hsdroid.txt
new file mode 100644
index 0000000000..d672e66d74
--- /dev/null
+++ b/metadata/com.brockoli.android.hsdroid.txt
@@ -0,0 +1,34 @@
+Categories:Games
+License:Apache2
+Web Site:
+Source Code:https://bitbucket.org/brockoli/hsdroid/src
+Issue Tracker:https://bitbucket.org/brockoli/hsdroid/issues
+
+Auto Name:HSDroid
+Summary:Watch hockey games
+Description:
+Client for watching hockeystreams.com live and on demand video streams. 
+It only uses (HLS) formated streams.
+
+Requires you to have an active account on http://www.hockeystreams.com
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/brockoli/hsdroid.git
+
+Build:1.6,9
+    commit=127e76
+    disable=hard-coded build-tools
+    gradle=yes
+    srclibs=SlidingMenu@9b3d8c15c1b0fbd;ActionBarSherlock@4.4.0
+    patch=build.gradle_9.patch;build-fix_9.patch
+    prebuild=echo -e "include ':SlidingMenu'\nproject(':SlidingMenu').projectDir = new File('$(readlink -f $$SlidingMenu$$)')" > settings.gradle && \
+             sed -i 's/targetSdkVersion="17"/targetSdkVersion="16"/g' $$SlidingMenu$$/AndroidManifest.xml && \
+             cp $$ActionBarSherlock$$/build.gradle $$SlidingMenu$$/ && \
+             sed -i -e 's/compileSdkVersion 14/compileSdkVersion 16/g' -e "s/buildToolsVersion '17.0.0'/buildToolsVersion '18.1.1'/g" $$SlidingMenu$$/build.gradle
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.6
+Current Version Code:9
+
diff --git a/metadata/com.brockoli.android.hsdroid/build-fix_9.patch b/metadata/com.brockoli.android.hsdroid/build-fix_9.patch
new file mode 100644
index 0000000000..a69e53a986
--- /dev/null
+++ b/metadata/com.brockoli.android.hsdroid/build-fix_9.patch
@@ -0,0 +1,12 @@
+diff --git a/src/com/brockoli/android/hsdroid/MainActivity.java b/src/com/brockoli/android/hsdroid/MainActivity.java
+index 4ebf2cb..da9fdcf 100644
+--- a/src/com/brockoli/android/hsdroid/MainActivity.java
++++ b/src/com/brockoli/android/hsdroid/MainActivity.java
+@@ -199,7 +199,6 @@ LoaderCallbacks<Cursor>{
+ 		SlidingMenu menu = getSlidingMenu();
+ 		menu.setBehindOffsetRes(R.dimen.actionbar_home_width);
+ 		menu.setBehindScrollScale(0.25f);
+-		menu.setShadowDrawable(R.drawable.defaultshadow);
+ 		menu.setShadowWidth(12);	
+ 	}
+ 
diff --git a/metadata/com.brockoli.android.hsdroid/build.gradle_9.patch b/metadata/com.brockoli.android.hsdroid/build.gradle_9.patch
new file mode 100644
index 0000000000..9e1f8ea5db
--- /dev/null
+++ b/metadata/com.brockoli.android.hsdroid/build.gradle_9.patch
@@ -0,0 +1,46 @@
+diff --git a/build.gradle b/build.gradle
+index 96f7215..914ab56 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,13 +1,22 @@
++buildscript {
++    repositories {
++        mavenCentral()
++    }
++    dependencies {
++        classpath 'com.android.tools.build:gradle:0.6.+'
++    }
++}
++
+ apply plugin: 'android'
+ 
+ dependencies {
+     compile fileTree(dir: 'libs', include: '*.jar')
+-    compile project(':SlidingMenu:library')
++    compile project(':SlidingMenu')
+ }
+ 
+ android {
+     compileSdkVersion 16
+-    buildToolsVersion "16.0.0"
++    buildToolsVersion "18.1.1"
+ 
+     sourceSets {
+         main {
+@@ -20,16 +29,5 @@ android {
+             assets.srcDirs = ['assets']
+         }
+ 
+-        // Move the tests to tests/java, tests/res, etc...
+-        instrumentTest.setRoot('tests')
+-
+-        // Move the build types to build-types/<type>
+-        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+-        // This moves them out of them default location under src/<type>/... which would
+-        // conflict with src/ being used by the main source set.
+-        // Adding new build types or product flavors should be accompanied
+-        // by a similar customization.
+-        debug.setRoot('build-types/debug')
+-        release.setRoot('build-types/release')
+     }
+ }
diff --git a/metadata/com.brocktice.JustSit.txt b/metadata/com.brocktice.JustSit.txt
index ecc817f36f..0adbdece9a 100644
--- a/metadata/com.brocktice.JustSit.txt
+++ b/metadata/com.brocktice.JustSit.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://code.google.com/p/justsit/
-Source Code:https://code.google.com/p/justsit/source/checkout
-Issue Tracker:https://code.google.com/p/justsit/issues/list
+Source Code:https://code.google.com/p/justsit/source
+Issue Tracker:https://code.google.com/p/justsit/issues
 
 Auto Name:Just Sit
 Summary:Meditation timer
@@ -10,18 +10,16 @@ Description:
 JustSit is designed to help you meditate. It currently runs timers for preparation to meditate and meditation, and allows you to turn off audible ringing and/or the device radios, and keep the screen on while the timer is running.
 
 The name is inspired by the saying,
-
 "If you walk, just walk, if you sit, just sit, but whatever you do, don't wobble." -Zen Master Unmon
 .
 
 Repo Type:git-svn
-Repo:http://justsit.googlecode.com/svn/trunk/
+Repo:http://justsit.googlecode.com/svn/trunk/JustSit
 
-Build Version:0.3.3,17,24,subdir=JustSit
+Build Version:0.3.3,17,24
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.3.3
 Current Version Code:17
 
diff --git a/metadata/com.brosmike.airpushdetector.txt b/metadata/com.brosmike.airpushdetector.txt
index b7e5dc3bb6..df7e71c8ec 100644
--- a/metadata/com.brosmike.airpushdetector.txt
+++ b/metadata/com.brosmike.airpushdetector.txt
@@ -1,13 +1,13 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/brosmike/AirPush-Detector
 Source Code:https://github.com/brosmike/AirPush-Detector
 Issue Tracker:https://github.com/brosmike/AirPush-Detector/issues
 
 Auto Name:AirPush Detector
-Summary:Where are the ads coming from?
+Summary:Discover where the ads are coming from
 Description:
-If you like to install apps from other repos (not recommended ;-)), and you start to get advertisements
+If you like to install apps from other repos, and you start to get advertisements
 in your notification area, this will tell you what app is causing it.
 .
 
diff --git a/metadata/com.btmura.android.reddit.txt b/metadata/com.btmura.android.reddit.txt
index d71bd773dd..1e325c91a8 100644
--- a/metadata/com.btmura.android.reddit.txt
+++ b/metadata/com.btmura.android.reddit.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/btmura/rbb
 Source Code:https://github.com/btmura/rbb
@@ -19,14 +19,40 @@ Reddit by Brian (rbb) is a fast and simple Reddit client for Android.
 Repo Type:git
 Repo:https://github.com/btmura/rbb.git
 
-Build Version:2.3,6,v2.3,target=android-17,srclibs=ViewPagerIndicator@2.4.1,\
-prebuild=rm -rf tests eclipse && \
-echo "android.library.reference.1=$$ViewPagerIndicator$$" >> project.properties && \
-mv libs/support/*.jar libs/
-Build Version:3.0,7,!proprietary blob (youtube api)
+Build:2.3,6
+    commit=v2.3
+    target=android-17
+    srclibs=ViewPagerIndicator@2.4.1
+    prebuild=rm -rf tests eclipse && \
+        echo "android.library.reference.1=$$ViewPagerIndicator$$" >> project.properties && \
+        mv libs/support/*.jar libs/
+
+Build:3.0,7
+    disable=proprietary blob (youtube api)
+    commit=unknown - see disabled
+
+Build:3.2,9
+    disable=java problems
+    commit=v3.2-foss
+    target=android-18
+    srclibs=1:ViewPagerIndicator@2.4.1
+    prebuild=rm -rf tests eclipse && \
+        mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
+
+Build:3.3,10
+    disable=java problems
+    commit=v3.3-foss
+    target=android-18
+    srclibs=1:ViewPagerIndicator@2.4.1
+    prebuild=mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
+
+Maintainer Notes:
+There's a separate FOSS branch, which doesn't include the proprietary YouTube
+API blob. ([https://github.com/btmura/rbb/issues/286 related issue])
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:3.0
-Current Version Code:7
+Current Version:3.3
+Current Version Code:10
 
diff --git a/metadata/com.bvalosek.cpuspy.txt b/metadata/com.bvalosek.cpuspy.txt
index dd590093b9..5f81262a23 100644
--- a/metadata/com.bvalosek.cpuspy.txt
+++ b/metadata/com.bvalosek.cpuspy.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/bvalosek/cpuspy
 Source Code:https://github.com/bvalosek/cpuspy
diff --git a/metadata/com.bvcode.ncopter.txt b/metadata/com.bvcode.ncopter.txt
index 47abbc0a32..17d9a7ec9d 100644
--- a/metadata/com.bvcode.ncopter.txt
+++ b/metadata/com.bvcode.ncopter.txt
@@ -1,16 +1,16 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/copter-gcs
-Source Code:http://code.google.com/p/copter-gcs/source/checkout
-Issue Tracker:http://code.google.com/p/copter-gcs/issues/list
+Source Code:http://code.google.com/p/copter-gcs/source
+Issue Tracker:http://code.google.com/p/copter-gcs/issues
 
+Auto Name:Copter GCS
 Summary:GCS for ArduCopter/ArduPirate
 Description:
 Provides a GCS for the ArduCopter/ArduPirate family of copters. Status readouts, GPS tracking/logging,
 PID tuning, calibration (Transmitter and sensors) and sensor readouts. Very useful for tuning in the field.
 Note that a Bluetooth to APM link is required. Visit the website for details.
 
-'''check this'''
 N.B It isn't possible to view the photos on a map because Google Maps is the only map source and
 f-droid can't supply an API key to use it.	
 .
@@ -18,16 +18,19 @@ f-droid can't supply an API key to use it.
 Repo Type:git
 Repo:https://code.google.com/p/copter-gcs/
 
-
-#Error running the first ndk build in ./jni
 #Build Version:Copter-GCS,9,4ab9b7a66d8d,subdir=copter-gcs,buildjni=no,\
 #prebuild=wget http://copter-gcs.googlecode.com/files/jMAVLink.zip && unzip jMAVLink.zip && \
 #rm -f jMAVLink.zip && rm -rf release && ndk-build && ndk-build -C jMAVLink && \
 #cp jMAVLink/libs/armeabi/jMAVLink.so libs/armeabi/ && rm -rf jMAVLink && \
 #sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
 
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:Copter-GCS
-Current Version Code:10
+Build:Copter-GCS,9
+    disable=ndk problems
+    commit=4ab9b7a66d8d
+    subdir=copter-gcs
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:Copter-GCS
+Current Version Code:9
 
diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt
index 47d1de22ba..acb4289deb 100644
--- a/metadata/com.bwx.bequick.txt
+++ b/metadata/com.bwx.bequick.txt
@@ -1,9 +1,9 @@
 AntiFeatures:NonFreeAdd
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/quick-settings/
-Source Code:http://code.google.com/p/quick-settings/source/checkout
-Issue Tracker:http://code.google.com/p/quick-settings/issues/list
+Source Code:http://code.google.com/p/quick-settings/source
+Issue Tracker:http://code.google.com/p/quick-settings/issues
 
 Summary:System settings tool
 Description:
@@ -15,9 +15,11 @@ or via the status bar.
 Anti-feature: Addons. Promotes other apps that aren't FOSS.
 Status: Won't be getting updates as the author is not publishing
 source code for the newer versions.
+
+Status: Source repo vanished
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://quick-settings.googlecode.com/svn/trunk/quick-settings/
 
 Build Version:1.9.8 p2,201012060,184,target=android-8
diff --git a/metadata/com.byagowi.persiancalendar.txt b/metadata/com.byagowi.persiancalendar.txt
index 57f76f90cf..3e56981178 100644
--- a/metadata/com.byagowi.persiancalendar.txt
+++ b/metadata/com.byagowi.persiancalendar.txt
@@ -1,29 +1,69 @@
-Category:Office
+Categories:Office
 License:GPLv3
-Web Site:http://azadrah.net/2012/03/opensource-jalali-calendar-for-android-released/
+Web Site:
 Source Code:https://github.com/ebraminio/DroidPersianCalendar
 Issue Tracker:https://github.com/ebraminio/DroidPersianCalendar/issues
 
 Auto Name:Persian Calendar
 Summary:View the Persian calendar
 Description:
-Persian calendar is not supported in Android so this can be used instead. Includes widgets
+Persian calendar is not supported in Android so this can be used instead.
+Includes widgets and dashclock provider.
 .
 
 Repo Type:git
 Repo:https://github.com/ebraminio/DroidPersianCalendar.git
 
-Build Version:1.98,18,85329,srclibs=PrayTimes@0b8576aa74,prebuild=\
-rm -rf libs && cp -r $$PrayTimes$$/java/src/PrayTimes/src/* src/
-Build Version:2.04,24,04e6dd9c4,rm=PersianCalendar.apk
-Build Version:2.09,29,14c35f5d215390ef6d287395112d471c67890fb4,rm=PersianCalendar.apk
-Build Version:3.06,36,9f3293ecca,srclibs=ColorPickerPreference@a6ffb91b1c,prebuild=\
-rm -rf *.apk extra && sed -i 's@\.1=.*@.1=$$ColorPickerPreference$$@' project.properties
-Build Version:3.08,38,03e3a31d88,srclibs=ColorPicker-Ebraminio@27deadaffe,prebuild=\
-rm -rf *.apk extra && sed -i 's@\.1=.*@.1=$$ColorPicker-Ebraminio$$@' project.properties
+Build:1.98,18
+    commit=85329
+    srclibs=PrayTimes@0b8576aa74
+    prebuild=rm -rf libs && \
+        cp -r $$PrayTimes$$/java/src/PrayTimes/src/* src/
+
+Build:2.04,24
+    commit=04e6dd9c4
+    rm=PersianCalendar.apk
+
+Build:2.09,29
+    commit=14c35f5d215390ef6d287395112d471c67890fb4
+    rm=PersianCalendar.apk
+
+Build:3.06,36
+    commit=9f3293ecca
+    srclibs=ColorPickerPreference@a6ffb91b1c
+    prebuild=rm -rf *.apk extra && \
+        sed -i 's@\.1=.*@.1=$$ColorPickerPreference$$@' project.properties
+
+Build:3.08,38
+    commit=03e3a31d88
+    srclibs=ColorPicker-Ebraminio@27deadaffe
+    prebuild=rm -rf *.apk extra && \
+        sed -i 's@\.1=.*@.1=$$ColorPicker-Ebraminio$$@' project.properties
+
+Build:4.02,42
+    commit=84a7b52237
+    subdir=PersianCalendar
+    gradle=yes
+    rm=PersianCalendar.apk;extra/
+
+Build:4.03,43
+    commit=4.03
+    subdir=PersianCalendar
+    gradle=yes
+    rm=PersianCalendar.apk;extra/
+
+Build:4.04,44
+    commit=4.04
+    subdir=PersianCalendar
+    gradle=yes
+    rm=PersianCalendar.apk;extra/
+
+Maintainer Notes:
+Using tags from 4.02 onwards.
+.
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:3.08
-Current Version Code:38
+Update Check Mode:Tags
+Current Version:4.04
+Current Version Code:44
 
diff --git a/metadata/com.casimirlab.simpleDeadlines.txt b/metadata/com.casimirlab.simpleDeadlines.txt
index fa794efed6..b48160adfb 100644
--- a/metadata/com.casimirlab.simpleDeadlines.txt
+++ b/metadata/com.casimirlab.simpleDeadlines.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/chibibi/simpleDeadlines
 Source Code:https://github.com/chibibi/simpleDeadlines
diff --git a/metadata/com.cepmuvakkit.times.txt b/metadata/com.cepmuvakkit.times.txt
index d0242397ae..0e786c01c5 100644
--- a/metadata/com.cepmuvakkit.times.txt
+++ b/metadata/com.cepmuvakkit.times.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/android-salat-times
-Source Code:http://code.google.com/p/android-salat-times/source/list
-Issue Tracker:http://code.google.com/p/android-salat-times/issues/list
+Source Code:http://code.google.com/p/android-salat-times/source
+Issue Tracker:http://code.google.com/p/android-salat-times/issues
 
 Auto Name:Salat Times
 Summary:Show prayer times
diff --git a/metadata/com.chessclock.android.txt b/metadata/com.chessclock.android.txt
index 5ae8aeee47..8b5bd7ca83 100644
--- a/metadata/com.chessclock.android.txt
+++ b/metadata/com.chessclock.android.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/simplechessclock/
-Source Code:https://code.google.com/p/simplechessclock/source/browse/
-Issue Tracker:https://code.google.com/p/simplechessclock/issues/list
+Source Code:https://code.google.com/p/simplechessclock/source
+Issue Tracker:https://code.google.com/p/simplechessclock/issues
 
 Auto Name:Simple Chess Clock
 Summary:Simple chess clock
@@ -17,8 +17,7 @@ Repo:https://code.google.com/p/simplechessclock/
 Build Version:1.2.0,8,379155447bff,subdir=simplechessclock,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.0
 Current Version Code:8
 
diff --git a/metadata/com.chmod0.manpages.txt b/metadata/com.chmod0.manpages.txt
index 5243d5181c..69804a9a4a 100644
--- a/metadata/com.chmod0.manpages.txt
+++ b/metadata/com.chmod0.manpages.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:BSD
 Web Site:http://julien.guepin.fr
 Source Code:https://github.com/chmod0/Manpages
@@ -16,8 +16,7 @@ Repo:https://github.com/chmod0/Manpages.git
 Build Version:1.51,3,8aff33631,prebuild=rm -rf *.apk htmlman pr
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.51
 Current Version Code:3
 
diff --git a/metadata/com.ciarang.tallyphant.txt b/metadata/com.ciarang.tallyphant.txt
index 5d2c5fbd43..8ec7bbc308 100644
--- a/metadata/com.ciarang.tallyphant.txt
+++ b/metadata/com.ciarang.tallyphant.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://projects.ciarang.com/p/tallyphant/
 Source Code:http://projects.ciarang.com/p/tallyphant/source/tree/master/
diff --git a/metadata/com.codebutler.farebot.txt b/metadata/com.codebutler.farebot.txt
index 590086c96c..1a8771f562 100644
--- a/metadata/com.codebutler.farebot.txt
+++ b/metadata/com.codebutler.farebot.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3+
 Web Site:http://codebutler.github.com/farebot
 Source Code:https://github.com/codebutler/farebot
diff --git a/metadata/com.coinbase.android.txt b/metadata/com.coinbase.android.txt
new file mode 100644
index 0000000000..5f3dddbaa0
--- /dev/null
+++ b/metadata/com.coinbase.android.txt
@@ -0,0 +1,40 @@
+Categories:Office
+License:Apache2
+Web Site:https://coinbase.com
+Source Code:https://github.com/coinbase/coinbase-android
+Issue Tracker:https://github.com/coinbase/coinbase-android/issues
+
+Auto Name:Coinbase
+Summary:Coinbase client
+Description:
+Client for coinbase, an online bitcoin wallet.
+
+* Send/request bitcoin payments using email, QR codes, or NFC
+* Buy and sell bitcoin right from your mobile phone
+* View transaction history, details, and balance
+* See prices in BTC or your native currency
+* Support for multiple accounts
+.
+
+Repo Type:git
+Repo:https://github.com/coinbase/coinbase-android.git
+
+Build:1.1.1,7
+    commit=74c206cab7
+    subdir=coinbase-android
+    gradle=yes
+
+Build:2.0,9
+    commit=2.0
+    subdir=coinbase-android
+    gradle=consumer
+
+Maintainer Notes:
+The merchant version hasn't been packaged yet
+.
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.0
+Current Version Code:9
+
diff --git a/metadata/com.colinmcdonough.android.torch.txt b/metadata/com.colinmcdonough.android.torch.txt
index 8f8d7fc6ee..5498bd13b9 100644
--- a/metadata/com.colinmcdonough.android.torch.txt
+++ b/metadata/com.colinmcdonough.android.torch.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/torch
-Source Code:http://code.google.com/p/torch/source/checkout
-Issue Tracker:http://code.google.com/p/torch/issues/list
+Source Code:http://code.google.com/p/torch/source
+Issue Tracker:http://code.google.com/p/torch/issues
 
 Auto Name:Torch
 Summary:LED Torch
@@ -13,13 +13,19 @@ Use v0.2.2 if you have problems on Android 4+.
 Repo Type:git-svn
 Repo:http://torch.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:0.1.2,2,release_0.1.2
-Build Version:0.2.3,6,release_0.2.3ics,prebuild=\
-find . -type f -print0 | xargs -0 sed -i 's/torchics/torch/g'
+Build:0.1.2,2
+    commit=release_0.1.2
+
+Build:0.2.3,6
+    commit=release_0.2.3ics
+    prebuild=find . -type f -print0 | xargs -0 sed -i 's/torchics/torch/g'
+
+Maintainer Notes:
+Different package name for the ICS versions, so no UCM applies.
+.
 
 Auto Update Mode:None
-# Tags doesn't get the most recent
-Update Check Mode:RepoManifest
-Current Version:0.1.2
-Current Version Code:2
+Update Check Mode:None
+Current Version:0.2.3
+Current Version Code:6
 
diff --git a/metadata/com.color.colornamer.txt b/metadata/com.color.colornamer.txt
new file mode 100644
index 0000000000..b53b2f72d8
--- /dev/null
+++ b/metadata/com.color.colornamer.txt
@@ -0,0 +1,27 @@
+Categories:System
+License:GPLv3
+Web Site:http://www.dektar.com
+Source Code:https://github.com/kaytdek/ColorNamer
+Issue Tracker:https://github.com/kaytdek/ColorNamer/issues
+
+Auto Name:Color Namer
+Summary:Names for colours
+Description:
+Ever wondered what the name for that colour is? Or wanted the code for
+a colour that could be described as 'dusty'?
+
+Identify colours via the camera and the xkcd survey and share them.
+Set colours to wallpaper.
+.
+
+Repo Type:git
+Repo:https://github.com/kaytdek/ColorNamer.git
+
+Build:2.3,8
+    commit=fed05971fc580
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.3
+Current Version Code:8
+
diff --git a/metadata/com.commonsware.android.arXiv.txt b/metadata/com.commonsware.android.arXiv.txt
index 9525694414..7ba2347b09 100644
--- a/metadata/com.commonsware.android.arXiv.txt
+++ b/metadata/com.commonsware.android.arXiv.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:GPLv2
 Web Site:http://code.google.com/p/arxiv-mobile
-Source Code:http://code.google.com/p/arxiv-mobile/source/list
-Issue Tracker:http://code.google.com/p/arxiv-mobile/issues/list
+Source Code:http://code.google.com/p/arxiv-mobile/source
+Issue Tracker:http://code.google.com/p/arxiv-mobile/issues
 
 Auto Name:arXiv mobile
 Summary:Client for arXiv.org
@@ -27,8 +27,7 @@ Build Version:2.0.16,102,!No source in repo,target=android-11
 Build Version:2.0.20,106,4,patch=fix.patch
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.20
 Current Version Code:106
 
diff --git a/metadata/com.concentricsky.android.khan.txt b/metadata/com.concentricsky.android.khan.txt
new file mode 100644
index 0000000000..c700c5913c
--- /dev/null
+++ b/metadata/com.concentricsky.android.khan.txt
@@ -0,0 +1,42 @@
+Categories:Science & Education
+License:GPLv3
+Web Site:https://github.com/concentricsky/android-viewer-for-khan-academy
+Source Code:https://github.com/concentricsky/android-viewer-for-khan-academy
+Issue Tracker:https://github.com/concentricsky/android-viewer-for-khan-academy/issues
+
+Name:Khan Academy viewer
+Auto Name:Viewer for Khan Academy
+Summary:Watch videos and lectures
+Description:
+View [http://khanacademy.org Khan Academy]'s library of over 4,000 educational
+videos. Topics covered include: general science, biology, chemistry, physics,
+math, finance, history, the humanities, and more.
+
+Khan Academy's library of videos is available free of charge. Teachers,
+students, scientists - people form all walks of life - will find Khan
+Academy's materials immensely valuable and engaging.
+
+You can take individual videos, or entire topics offline to watch when you
+don't have a network connection. Follow along, skip ahead, or go back by
+navigating subtitles, and connect with your Khan Academy user account to track
+your work and earn achievements.
+.
+
+Repo Type:git
+Repo:https://github.com/concentricsky/android-viewer-for-khan-academy.git
+
+Build:1.2.2,14
+    commit=13566d739dc674
+    patch=pom_14.patch
+    extlibs=android/android-support-v4r11.jar
+    prebuild=cp oauth_credentials.json.sample res/raw/oauth_credentials.json && \
+             $$MVN3$$ install:install-file -DgroupId=com.google.android \
+               -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar \
+               -Dfile=libs/android-support-v4r11.jar
+    maven=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.2.2
+Current Version Code:14
+
diff --git a/metadata/com.concentricsky.android.khan/pom_14.patch b/metadata/com.concentricsky.android.khan/pom_14.patch
new file mode 100644
index 0000000000..ae74e67a3b
--- /dev/null
+++ b/metadata/com.concentricsky.android.khan/pom_14.patch
@@ -0,0 +1,48 @@
+diff --git a/pom.xml b/pom.xml
+index b762225..873eff9 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -7,17 +7,6 @@
+     <packaging>apk</packaging>
+     <name>Viewer for Khan Academy</name>
+ 
+-    <repositories>
+-        <repository>
+-            <id>codehaus-snapshots</id>
+-            <url>http://snapshots.repository.codehaus.org</url>
+-        </repository>
+-        <repository>
+-            <id>springsource-repo</id>
+-            <name>SpringSource Repository</name>
+-            <url>http://repo.springsource.org/release</url>
+-        </repository>
+-    </repositories>
+ 
+     <dependencies>
+         <dependency>
+@@ -27,15 +16,10 @@
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
+-            <groupId>android.support</groupId>
+-            <artifactId>compatibility-v4</artifactId>
+-            <version>11</version>
+-        </dependency>
+-        <!-- <dependency>
+             <groupId>com.google.android</groupId>
+             <artifactId>support-v4</artifactId>
+             <version>r11</version>
+-        </dependency> -->
++        </dependency>
+         <dependency>
+             <groupId>com.fasterxml.jackson.core</groupId>
+             <artifactId>jackson-core</artifactId>
+@@ -132,7 +116,7 @@
+                 <plugin>
+                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                     <artifactId>android-maven-plugin</artifactId>
+-                    <version>3.3.2</version>
++                    <version>3.6.1</version>
+ 
+                     <extensions>true</extensions>
+                 </plugin>
diff --git a/metadata/com.corner23.android.beautyclocklivewallpaper.txt b/metadata/com.corner23.android.beautyclocklivewallpaper.txt
new file mode 100644
index 0000000000..ddcec3dfe5
--- /dev/null
+++ b/metadata/com.corner23.android.beautyclocklivewallpaper.txt
@@ -0,0 +1,34 @@
+Category:Wallpaper
+License:MIT
+Web Site:
+Source Code:https://github.com/shakalaca/BeautyClockLiveWallpaper
+Issue Tracker:https://github.com/shakalaca/BeautyClockLiveWallpaper/issues
+
+Auto Name:Beauty Clock
+Summary:Pictures of people with the time
+Description:
+Bijin Tokei is a genre of wallpaper that is popular in East Asia.
+Every minute the wallpaper changes to a picture of a pretty girl
+holding an object that displays the time.
+
+This app will download the pictures for every minute from your chosen
+site without caching them ''but'' it will check if images already exist
+in '''sdcard/BeautyClock/pic/site/''' and the scheme is always aabb.jpg
+where aa is the hour and bb is the minute.
+In this way, you can have the app display any images that you want.
+.
+
+Repo Type:git
+Repo:https://github.com/shakalaca/BeautyClockLiveWallpaper.git
+
+Build Version:2.5,12,8abb9d220c78,target=android-14
+
+Maintainer Notes:
+Not published anywhere seemingly
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.5
+Current Version Code:12
+
diff --git a/metadata/com.cr5315.cfdc.txt b/metadata/com.cr5315.cfdc.txt
new file mode 100644
index 0000000000..2aacd7c64c
--- /dev/null
+++ b/metadata/com.cr5315.cfdc.txt
@@ -0,0 +1,37 @@
+Categories:Office
+License:GPLv3
+Web Site:http://cr5315.com
+Source Code:https://github.com/cr5315/countdown-for-dashclock
+Issue Tracker:https://github.com/cr5315/countdown-for-dashclock/issues
+
+Auto Name:Countdown for DashClock
+Summary:Countdown on the lock screen
+Description:
+Extension for [[net.nurik.roman.dashclock]] that displays the time
+remaining until an event.
+.
+
+Repo Type:git
+Repo:https://github.com/cr5315/countdown-for-dashclock.git
+
+Build:1.3.2,17
+    commit=f1dd7
+    rm=libs/dashclock-api-r2.0.jar
+    srclibs=DashClock@ecb5a191880
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src/main/java;$$DashClock$$/api/src/main/aidl' >> project.properties
+
+Build:1.3.3,18
+    commit=2cf6d12841
+    rm=libs/dashclock-api-r2.0.jar
+    srclibs=DashClock@ecb5a191880
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src/main/java;$$DashClock$$/api/src/main/aidl' >> project.properties
+
+Maintainer Notes:
+There are tags, but not up to date.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3.3
+Current Version Code:18
+
diff --git a/metadata/com.cradle.iitc_mobile.txt b/metadata/com.cradle.iitc_mobile.txt
index e07328bbe0..bb96dd44de 100644
--- a/metadata/com.cradle.iitc_mobile.txt
+++ b/metadata/com.cradle.iitc_mobile.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Games
+Categories:Games
 License:ISC
 Web Site:http://iitc.jonatkins.com/
 Source Code:https://github.com/jonatkins/ingress-intel-total-conversion/
@@ -21,44 +21,140 @@ free-as-in-freedom nor open-source.
 Repo Type:git
 Repo:https://github.com/jonatkins/ingress-intel-total-conversion.git
 
-Build Version:0.3.2,13,!non-functional 18f9ef0c2e4af,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'Mobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.3.2.1,14,18f9ef0c2e4af,forceversion=yes,forcevercode=yes,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.3.6,18,!not CV (at 9edcdaac),subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.4.0,21,iitc_0_12_0_mobile_0_4_0,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.4.6,27,iitc_0_12_1_mobile_0_4_6,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.4.8,29,iitc_0_12_2_mobile_0_4_8,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.5.2,33,iitc_0_13_0_mobile_0_5_2,subdir=mobile,prebuild=\
-cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.5.4,35,iitc_0_13_1_mobile_0_5_4,subdir=mobile,\
-prebuild=cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.5.4.2,37,iitc_0_13_3_mobile_0_5_4_2,subdir=mobile,\
-prebuild=cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.5.6,40,iitc_0_14_0_mobile_0_5_6,subdir=mobile,\
-prebuild=cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py,\
-build=cd .. && ./build.py fdroid
-Build Version:0.7.1,51,iitc_0_14_2_mobile_0_7_1,subdir=mobile,\
-prebuild=\
-	(cd .. && echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) \
-,build=\
-	(cd .. && ./build.py fdroid)
+Build:0.3.2,13
+    disable=!non-functional 18f9ef0c2e4af
+    commit=unknown - see disabled
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'Mobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.3.2.1,14
+    commit=18f9ef0c2e4af
+    subdir=mobile
+    forceversion=yes
+    forcevercode=yes
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.3.6,18
+    disable=!not CV (at 9edcdaac)
+    commit=9edcdaac
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.4.0,21
+    commit=iitc_0_12_0_mobile_0_4_0
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.4.6,27
+    commit=iitc_0_12_1_mobile_0_4_6
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.4.8,29
+    commit=iitc_0_12_2_mobile_0_4_8
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.5.2,33
+    commit=iitc_0_13_0_mobile_0_5_2
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.5.4,35
+    commit=iitc_0_13_1_mobile_0_5_4
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.5.4.2,37
+    commit=iitc_0_13_3_mobile_0_5_4_2
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.5.6,40
+    commit=iitc_0_14_0_mobile_0_5_6
+    subdir=mobile
+    prebuild=cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py
+    build=cd .. && \
+        ./build.py fdroid
+
+Build:0.7.1,51
+    commit=iitc_0_14_2_mobile_0_7_1
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
+
+Build:0.7.4,54
+    commit=iitc_0_14_3_mobile_0_7_4
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
+
+Build:0.7.7,57
+    commit=iitc_0_14_4_mobile_0_7_7
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
+
+Build:0.9,60
+    commit=iitc_0_15_0_mobile_0_9_fixed_code
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
+
+Build:0.10.0,61
+    commit=iitc_0_16_0_mobile_0_10_0
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
+
+Build:0.10.1,62
+    commit=iitc_0_16_1_mobile_0_10_1
+    subdir=mobile
+    prebuild=(cd .. && \
+        echo "buildSettings={'fdroid':{'buildMobile':'copyonly'}}" > localbuildsettings.py) 
+    build=(cd .. && \
+        ./build.py fdroid)
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.7.4
-Current Version Code:54
+Current Version:0.10.3
+Current Version Code:64
 
diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt
index d1fd1fdff1..ae5dff5a42 100644
--- a/metadata/com.csipsimple.txt
+++ b/metadata/com.csipsimple.txt
@@ -1,9 +1,9 @@
 Disabled:Need to build recent version from source
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://code.google.com/p/csipsimple/
-Source Code:http://code.google.com/p/csipsimple/source/checkout
-Issue Tracker:http://code.google.com/p/csipsimple/issues/list
+Source Code:http://code.google.com/p/csipsimple/source
+Issue Tracker:http://code.google.com/p/csipsimple/issues
 Donate:http://code.google.com/p/csipsimple/wiki/Donate
 
 Auto Name:CSipSimple
@@ -22,7 +22,7 @@ Description:
 N.B This apk is form ARMv7 only. Other ABIs are available from the website
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://csipsimple.googlecode.com/svn/branches/stable-01.00
 
 # svn update to different revision will break repo so may as well use the stable branch
diff --git a/metadata/com.ctrlplusz.dashclock.yr.txt b/metadata/com.ctrlplusz.dashclock.yr.txt
index fefff1395a..56929361bb 100644
--- a/metadata/com.ctrlplusz.dashclock.yr.txt
+++ b/metadata/com.ctrlplusz.dashclock.yr.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Unknown
 Web Site:https://github.com/hanspeide/dashclock-yr-extension
 Source Code:https://github.com/hanspeide/dashclock-yr-extension
diff --git a/metadata/com.cyanogenmod.filemanager.ics.txt b/metadata/com.cyanogenmod.filemanager.ics.txt
index 4356de5978..a8e3faee28 100644
--- a/metadata/com.cyanogenmod.filemanager.ics.txt
+++ b/metadata/com.cyanogenmod.filemanager.ics.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/mcrosson/android_packages_apps_CMFileManager
diff --git a/metadata/com.cyanogenmod.lockclock.txt b/metadata/com.cyanogenmod.lockclock.txt
index 3d857d1860..5ad8dff232 100644
--- a/metadata/com.cyanogenmod.lockclock.txt
+++ b/metadata/com.cyanogenmod.lockclock.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 # https://jira.cyanogenmod.org/browse/CYAN-1026 
 #License:Apache2 for source; resources don't have a license
 Web Site:http://www.cyanogenmod.org
diff --git a/metadata/com.cybrosys.palmcalc.txt b/metadata/com.cybrosys.palmcalc.txt
new file mode 100644
index 0000000000..b3fde0bfd2
--- /dev/null
+++ b/metadata/com.cybrosys.palmcalc.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:GPLv3
+Web Site:http://palmcalc.com
+Source Code:https://github.com/cybro/PalmCalc
+Issue Tracker:https://github.com/cybro/PalmCalc/issues
+
+Auto Name:PalmCalc
+Summary:7-in-1 calculator
+Description:
+Calculates currency, BMI, units, as well as the usual stuff.
+.
+
+Repo Type:git
+Repo:https://github.com/cybro/PalmCalc.git
+
+Build:2.2,4
+    commit=3555f
+    subdir=PalmCalc
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.2
+Current Version Code:4
+
diff --git a/metadata/com.dalthed.tucan.txt b/metadata/com.dalthed.tucan.txt
new file mode 100644
index 0000000000..4a83289983
--- /dev/null
+++ b/metadata/com.dalthed.tucan.txt
@@ -0,0 +1,31 @@
+Categories:Science & Education
+License:GPLv3+
+Web Site:https://github.com/Tyde/TuCanMobile
+Source Code:https://github.com/Tyde/TuCanMobile
+Issue Tracker:https://github.com/Tyde/TuCanMobile/issues
+
+Auto Name:TuCanMobile
+Summary:Campus system TUCaN of the TU Darmstadt
+Description:
+Das Studentenveraltungstool TUCaN Mobile der TU Darmstadt ist über das Handy
+bisher sehr schwer zu bedienen gewesen. Das ändert sich nun für alle
+Android-Benutzer. Diese App liest die Seite aus uns gibt sie passend für
+kleine Bildschirme dar. Derzeit kann man leider sich nicht für Veranstaltungen
+anmelden und das Anmelden für Prüfungen ist nur experimentell, jedoch ist es
+sehr Praktisch um schnell mal einige Infos oder Materialien von TuCan
+herunterzuladen.
+.
+
+Repo Type:git
+Repo:https://github.com/Tyde/TuCanMobile.git
+
+Build:0.3.5,30
+    disable=non-free libs
+    commit=0.3.5
+    srclibs=1:ActionBarSherlock@4.2.0;2:ViewPagerIndicator@2.4.1
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.3.6
+Current Version Code:31
+
diff --git a/metadata/com.danielme.muspyforandroid.txt b/metadata/com.danielme.muspyforandroid.txt
new file mode 100644
index 0000000000..c6d5c2dd72
--- /dev/null
+++ b/metadata/com.danielme.muspyforandroid.txt
@@ -0,0 +1,26 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://danielme.com/muspy-for-android
+Source Code:https://github.com/danielme-com/Muspy-for-Android
+Issue Tracker:
+
+Summary:Keep track of musicians
+Description:
+Client for [https://muspy.com Muspy.com]; import your favourite 
+artists and you'll be notified when they have new recordings or gigs. 
+You'll also get associated links to Wikipedia et al. and see the album
+art.
+
+Muspy.com is based on Muspy, AGPL software that checks 
+[http://musicbrainz.org MusicBrainz].
+.
+
+Repo Type:git
+Repo:https://github.com/danielme-com/Muspy-for-Android.git
+
+Build Version:1.2,3,826fa
+
+Update Check Mode:RepoManifest
+Current Version:xxx
+Current Version Code:3
+
diff --git a/metadata/com.danvelazco.fbwrapper.txt b/metadata/com.danvelazco.fbwrapper.txt
index 92379936ea..d6c35f2f54 100644
--- a/metadata/com.danvelazco.fbwrapper.txt
+++ b/metadata/com.danvelazco.fbwrapper.txt
@@ -1,5 +1,5 @@
-AntiFeatures:Tracking,NonFreeAdd
-Category:Internet
+AntiFeatures:Tracking
+Categories:Internet
 License:Apache2
 Web Site:
 Source Code:https://github.com/velazcod/Tinfoil-Facebook
@@ -19,25 +19,39 @@ the preferences section, which is disabled by default.
 
 AntiFeatures:
 * Tracking. You are required to log in to Facebook.
-* Addons. In the near future, a non-free add-on will add features to this app.
 .
 
 Repo Type:git
 Repo:https://github.com/velazcod/Tinfoil-Facebook
 
-Build Version:1.1.8,20130520,v1.1.8
-Build Version:1.2,20130702,v1.2,forceversion=yes,forcevercode=yes,target=android-17,\
-subdir=Tinfoil-for-Facebook/src/main,extlibs=android/android-support-v4.jar,prebuild=\
-echo "source.dir=java" > ant.properties 
-Build Version:1.2.1,20130726,v1.2.1,subdir=Tinfoil-for-Facebook/src/main,\
-forceversion=yes,forcevercode=yes,\
-target=android-18,\
-extlibs=android/android-support-v4r13.jar,\
-prebuild=echo "source.dir=java" > ant.properties 
+Build:1.1.8,20130520
+    commit=v1.1.8
+
+Build:1.2,20130702
+    commit=v1.2
+    subdir=Tinfoil-for-Facebook/src/main
+    target=android-17
+    forceversion=yes
+    forcevercode=yes
+    extlibs=android/android-support-v4.jar
+    prebuild=echo "source.dir=java" > ant.properties 
+
+Build:1.2.1,20130726
+    commit=v1.2.1
+    subdir=Tinfoil-for-Facebook/src/main
+    target=android-18
+    forceversion=yes
+    forcevercode=yes
+    extlibs=android/android-support-v4r13.jar
+    prebuild=echo "source.dir=java" > ant.properties 
+
+Build:1.3,20140104
+    commit=v1.3
+    subdir=Tinfoil-for-Facebook
+    gradle=yes
 
 Auto Update Mode:None
-# Device-variable; version in build.gradle
-Update Check Mode:None
-Current Version:1.2.1
-Current Version Code:20130726
+Update Check Mode:Tags
+Current Version:1.3
+Current Version Code:20140104
 
diff --git a/metadata/com.darknessmap.txt b/metadata/com.darknessmap.txt
new file mode 100644
index 0000000000..893ee533d7
--- /dev/null
+++ b/metadata/com.darknessmap.txt
@@ -0,0 +1,25 @@
+Category:Navigation
+License:MIT
+Web Site:http://darknessmap.com
+Source Code:https://github.com/ercanpinar/app-android
+Issue Tracker:https://github.com/ercanpinar/app-android/issues
+
+Auto Name:Darkness Map
+Summary:Crowd-sourced mapping
+Description:
+Contribute to the Darkness map: a visualization of light levels in
+the city at night.
+
+Status: Beta.
+.
+
+Repo Type:git
+Repo:https://github.com/ercanpinar/app-android.git
+
+Build Version:0.2.0,1,15c0f378ae4a4,target=android-18
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.2.0
+Current Version Code:1
+
diff --git a/metadata/com.darshancomputing.BatteryIndicatorPro.txt b/metadata/com.darshancomputing.BatteryIndicatorPro.txt
new file mode 100644
index 0000000000..e15fc3aa51
--- /dev/null
+++ b/metadata/com.darshancomputing.BatteryIndicatorPro.txt
@@ -0,0 +1,37 @@
+Categories:System
+License:GPLv3
+Web Site:http://code.google.com/p/battery-indicator/wiki
+Source Code:http://code.google.com/p/battery-indicator/source
+Issue Tracker:http://code.google.com/p/battery-indicator/issues
+Donate:http://code.google.com/p/battery-indicator/wiki/PackageDownload?tm=2
+
+Auto Name:BatteryBot Pro
+Summary:Battery monitoring tool
+Description:
+Shows your battery charge level (percent) as an icon in your status bar, with 
+temperature, health, voltage, and time since plugged / unplugged in the 
+notification area. It also has user-configurable alarms, logs, and widgets.
+
+* Automatic time-remaining estimates based on recent usage
+* Several icon sets (including fully configurable green, amber, red, and black icons)
+* Small (1x1) and large (4x1) app widgets
+* Notification (with status bar icon) is now optional -- can be used as just a desktop widget
+* Battery logging. You can log the battery state (charge, status, voltage, temperature) and browse the logs on the phone or export to CSV.
+* Manually or automatically disable / re-enable device lock screen / lockscreen / keyguard
+* Alarms (full, charge above X, charge below X, temperature above X, or health failure)
+* Control the notification priority on Android 4.1+ (For example, you can set to "minimum" to hide the icon but keep the notification in the tray.)
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/battery-indicator/
+
+Build:8.1.8,11162
+    commit=698744debcd8840873f74f97dd25ead65be35364
+    target=android-17
+    rm=custom_rules.xml;image-playground;test
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:8.1.8
+Current Version Code:11162
+
diff --git a/metadata/com.dconstructing.cooper.txt b/metadata/com.dconstructing.cooper.txt
new file mode 100644
index 0000000000..a2622b0b59
--- /dev/null
+++ b/metadata/com.dconstructing.cooper.txt
@@ -0,0 +1,51 @@
+Categories:Development
+License:GPLv3
+Web Site:http://dconstructing.com
+Source Code:https://github.com/losttime/cooper
+Issue Tracker:https://github.com/losttime/cooper/issues
+
+Auto Name:Cooper
+Summary:Remote file editing
+Description:
+Edit files on your linux machine, even when you're on the go.
+Cooper provides a touch interface for SSH, making it easy to log in to a 
+servers and edit files. 
+Make simple code/configuration changes without squinting at a tiny terminal 
+and using a special keyboard.
+
+Cooper does:
+* Allow password based login to SSH servers
+* Let you traverse the directory structure on SSH servers
+* Let you open and edit files on SSH servers
+* Save a list of your SSH servers (for easy access)
+
+This app is being developed to make remote software/web-app development easier, 
+so future improvements will include tablet optimized layouts, a touch optimized 
+command execution interface (menu based with support for custom commands), and 
+a mechanism for jumping between open files.
+
+Cooper does not:
+* Allow command execution
+* Provide root/sudo support
+* Save your SSH password
+* Support non-standard SSH ports
+
+Status: Beta.
+.
+
+Repo Type:git
+Repo:https://github.com/losttime/cooper.git
+
+Build:1.1,2
+    commit=v1.1
+    subdir=cooper
+    extlibs=cooper.ic_launcher.png
+    prebuild=mkdir src/main/res/drawable && \
+        mv libs/cooper.ic_launcher.png src/main/res/drawable/ic_launcher.png
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.debian.debiandroid.txt b/metadata/com.debian.debiandroid.txt
index fcdcbb3645..3bddbceed4 100644
--- a/metadata/com.debian.debiandroid.txt
+++ b/metadata/com.debian.debiandroid.txt
@@ -1,4 +1,4 @@
-Category:Science & Education;Development
+Categories:Science & Education,Development
 License:GPLv3+
 Web Site:https://github.com/uberspot/DebianDroid
 Source Code:https://github.com/uberspot/DebianDroid
diff --git a/metadata/com.digitallizard.nicecompass.txt b/metadata/com.digitallizard.nicecompass.txt
index 1b6c582612..b5d964b5be 100644
--- a/metadata/com.digitallizard.nicecompass.txt
+++ b/metadata/com.digitallizard.nicecompass.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:NewBSD
 Web Site:https://market.android.com/details?id=com.digitallizard.nicecompass
 Source Code:https://github.com/okey666/NiceCompass
@@ -17,8 +17,7 @@ Build Version:1.3,6,b6f322cf10ec4320ca5b4111f75dccfdd4b6f7f0,target=android-13,s
 sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3
 Current Version Code:6
 
diff --git a/metadata/com.dje.openwifinetworkremover.txt b/metadata/com.dje.openwifinetworkremover.txt
new file mode 100644
index 0000000000..4b4e20c2d8
--- /dev/null
+++ b/metadata/com.dje.openwifinetworkremover.txt
@@ -0,0 +1,30 @@
+Categories:Internet
+License:GPLv3
+Web Site:
+Source Code:https://github.com/duncanje/android-open-wifi-network-remover
+Issue Tracker:https://github.com/duncanje/android-open-wifi-network-remover/issues
+
+Auto Name:Open WiFi Cleaner
+Summary:Forget open access points
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/duncanje/android-open-wifi-network-remover.git
+
+Build:0.1.5,15
+    commit=0.1.5
+    srclibs=1:Support-v7@android-4.3_r2.1
+    prebuild=mv dependencies/android-settings-goodies-0.2/libs/android-support-v4.jar $$Support-v7$$/libs/
+
+Build:0.1.5.1,16
+    commit=0.1.5.1
+    srclibs=1:Support-v7@android-4.3_r2.1
+    prebuild=mv dependencies/android-settings-goodies-0.2/libs/android-support-v4.jar $$Support-v7$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1.5.2
+Current Version Code:17
+
diff --git a/metadata/com.dngames.mobilewebcam.txt b/metadata/com.dngames.mobilewebcam.txt
index 0c6c293a69..8c1660488d 100644
--- a/metadata/com.dngames.mobilewebcam.txt
+++ b/metadata/com.dngames.mobilewebcam.txt
@@ -1,8 +1,9 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:Apache2
 Web Site:http://code.google.com/p/mobilewebcam-android
-Source Code:http://code.google.com/p/mobilewebcam-android/source/list
-Issue Tracker:http://code.google.com/p/mobilewebcam-android/issues/list
+Source Code:http://code.google.com/p/mobilewebcam-android/source
+Issue Tracker:http://code.google.com/p/mobilewebcam-android/issues
 Donate:http://forum.xda-developers.com/donatetome.php?u=2554465
 
 Auto Name:MobileWebCam
diff --git a/metadata/com.dougkeen.bart.txt b/metadata/com.dougkeen.bart.txt
index a1408a0f90..c5e4b03dbc 100644
--- a/metadata/com.dougkeen.bart.txt
+++ b/metadata/com.dougkeen.bart.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:
 Source Code:https://github.com/dougkeen/BartRunnerAndroid
diff --git a/metadata/com.dozingcatsoftware.asciicam.txt b/metadata/com.dozingcatsoftware.asciicam.txt
index c0e17cd412..121419b165 100644
--- a/metadata/com.dozingcatsoftware.asciicam.txt
+++ b/metadata/com.dozingcatsoftware.asciicam.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://www.dozingcatsoftware.com/
 Source Code:https://github.com/dozingcat/AsciiCam
@@ -20,12 +20,19 @@ the standard camera app.
 Repo Type:git
 Repo:https://github.com/dozingcat/AsciiCam.git
 
-Build Version:1.1,5,25f4d0aaca,buildjni=yes,prebuild=\
-rm -rf libs/armeabi*/ && sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
+Build:1.1,5
+    commit=25f4d0aaca
+    prebuild=rm -rf libs/armeabi*/ && \
+        sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
+    buildjni=yes
+
+Build:1.1.1,6
+    commit=340349e80b
+    prebuild=sed -i '/^APP_PROJECT_PATH/d' jni/Application.mk
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1
-Current Version Code:5
+Update Check Mode:RepoManifest
+Current Version:1.1.1
+Current Version Code:6
 
diff --git a/metadata/com.dozingcatsoftware.bouncy.txt b/metadata/com.dozingcatsoftware.bouncy.txt
index 1f640be210..de1211f658 100644
--- a/metadata/com.dozingcatsoftware.bouncy.txt
+++ b/metadata/com.dozingcatsoftware.bouncy.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://www.dozingcatsoftware.com
 Source Code:https://github.com/dozingcat/Vector-Pinball
@@ -18,8 +18,7 @@ Build Version:1.3,10,1210949b1e373916d096
 Build Version:1.3.1,11,04ee044b27,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3.1
 Current Version Code:11
 
diff --git a/metadata/com.dozingcatsoftware.cameratimer.txt b/metadata/com.dozingcatsoftware.cameratimer.txt
index ef2c9d5be9..f915f21378 100644
--- a/metadata/com.dozingcatsoftware.cameratimer.txt
+++ b/metadata/com.dozingcatsoftware.cameratimer.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:
 Source Code:https://github.com/dozingcat/CamTimer
diff --git a/metadata/com.dozingcatsoftware.dodge.txt b/metadata/com.dozingcatsoftware.dodge.txt
index cf44b949d9..12b0359f62 100644
--- a/metadata/com.dozingcatsoftware.dodge.txt
+++ b/metadata/com.dozingcatsoftware.dodge.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://www.dozingcatsoftware.com
-Source Code:http://code.google.com/p/dodge-android/source/checkout
-Issue Tracker:http://code.google.com/p/dodge-android/issues/list
+Source Code:http://code.google.com/p/dodge-android/source
+Issue Tracker:http://code.google.com/p/dodge-android/issues
 
 Auto Name:Dodge
 Summary:Guide the ball to safety
@@ -16,8 +16,7 @@ Repo:http://dodge-android.googlecode.com/svn/trunk/
 Build Version:1.4.3,8,11
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.3
 Current Version Code:8
 
diff --git a/metadata/com.dozuki.ifixit.txt b/metadata/com.dozuki.ifixit.txt
index 83eb45406e..53bfaa0f5b 100644
--- a/metadata/com.dozuki.ifixit.txt
+++ b/metadata/com.dozuki.ifixit.txt
@@ -1,10 +1,11 @@
-Category:System
+AntiFeatures:UpstreamNonFree
+Categories:System
 License:GPLv3
 Web Site:http://ifixit.org
 Source Code:https://github.com/iFixit/iFixitAndroid
 Issue Tracker:https://github.com/iFixit/iFixitAndroid/issues
 
-Auto Name:
+Auto Name:@string/app_name
 Summary:Gadget repair guide
 Description:
 The official iFixit app offers native guide viewing using iFixit’s
@@ -16,39 +17,105 @@ v1.2.1+ is built with the non-free Google Analytics library replaced with the fr
 Repo Type:git
 Repo:https://github.com/iFixit/iFixitAndroid.git
 
-Build Version:1.1.1,7,v1.1.1,subdir=App,target=android-15,\
-update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;\
-../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/HoloEverywhereLib,\
-init=sed -i 's/git@github.com:/https:\/\/github.com\//g' ../.gitmodules && \
-sed -i 's/git@github.com:/https:\/\/github.com\//g' ../.git/config && cd .. && git submodule init && \
-git submodule update && cd App
-Build Version:1.2.1,9,dce77248,submodules=yes,target=android-16,\
-srclibs=NoAnalytics@158a4a,subdir=App,prebuild=\
-rm -f libs/* && echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties,\
-update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;\
-../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
-Build Version:1.2.3,11,!one error v1.2.3,submodules=yes,\
-srclibs=NoAnalytics@158a4a,subdir=App,prebuild=\
-rm libs/libGoogleAnalytics.jar && mvn clean package -f ../http-request/lib/pom.xml && \
-mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
-echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties,\
-update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;\
-../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
-Build Version:1.3,12,v1.3,target=android-17,submodules=yes,srclibs=NoAnalytics@158a4a,subdir=App,prebuild=\
-rm libs/libGoogleAnalytics.jar && mvn clean package -f ../http-request/lib/pom.xml && \
-mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
-echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties,\
-update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;\
-../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
-Build Version:1.3.2,14,v1.3.2,target=android-17,submodules=yes,srclibs=NoAnalytics@158a4a,subdir=App,prebuild=\
-rm libs/libGoogleAnalytics.jar && mvn clean package -f ../http-request/lib/pom.xml && \
-mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
-echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties,\
-update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;\
-../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
+Build:1.1.1,7
+    commit=v1.1.1
+    subdir=App
+    init=sed -i 's/git@github.com:/https:\/\/github.com\//g' ../.gitmodules && \
+        sed -i 's/git@github.com:/https:\/\/github.com\//g' ../.git/config && \
+        cd .. && \
+        git submodule init && \
+        git submodule update && \
+        cd App
+    target=android-15
+    update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/HoloEverywhereLib
+
+Build:1.2.1,9
+    commit=dce77248
+    subdir=App
+    submodules=yes
+    target=android-16
+    update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
+    srclibs=NoAnalytics@158a4a
+    prebuild=rm -f libs/* && \
+        echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties
+
+Build:1.2.3,11
+    disable=one error v1.2.3
+    commit=unknown - see disabled
+    subdir=App
+    submodules=yes
+    update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
+    srclibs=NoAnalytics@158a4a
+    prebuild=rm libs/libGoogleAnalytics.jar && \
+        mvn clean package -f ../http-request/lib/pom.xml && \
+        mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
+        echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties
+
+Build:1.3,12
+    commit=v1.3
+    subdir=App
+    submodules=yes
+    target=android-17
+    update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
+    srclibs=NoAnalytics@158a4a
+    prebuild=rm libs/libGoogleAnalytics.jar && \
+        mvn clean package -f ../http-request/lib/pom.xml && \
+        mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
+        echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties
+
+Build:1.3.2,14
+    commit=v1.3.2
+    subdir=App
+    submodules=yes
+    target=android-17
+    update=.;../Android-ViewPagerIndicator/library;../AndroidSectionHeaders/library;../ActionBarSherlock/library;../ImageZoomLibrary;../AndroidImageManager/library;../HoloEverywhere/library
+    srclibs=NoAnalytics@158a4a
+    prebuild=rm libs/libGoogleAnalytics.jar && \
+        mvn clean package -f ../http-request/lib/pom.xml && \
+        mv ../http-request/lib/target/http-request-3.1-SNAPSHOT.jar libs/ && \
+        echo "android.library.reference.7=$$NoAnalytics$$" >> project.properties
+
+Build:2.0.1,37
+    commit=v2.0.1
+    subdir=App
+    gradle=ifixit
+    srclibs=NoAnalytics@eacdf5bcc9
+    prebuild=rm -f libs/* && \
+        mv $$NoAnalytics$$/src/com/* src/com/ && \
+        echo 'ifixitAppId="com.dozuki.ifixit"' > gradle.properties
+
+Build:2.1.0,39
+    disable=not building
+    commit=v2.1.0
+    subdir=App
+    gradle=ifixit
+    srclibs=NoAnalytics@eacdf5bcc9
+    prebuild=rm -f libs/* && \
+        mv $$NoAnalytics$$/src/com/* src/com/ && \
+        echo 'ifixitAppId="com.dozuki.ifixit"' > gradle.properties
+
+Build:2.3.0,39
+    commit=v2.3.0
+    subdir=App
+    gradle=ifixit
+    srclibs=NoAnalytics@eacdf5bcc9
+    prebuild=rm -f libs/* && \
+        mv $$NoAnalytics$$/src/com/* src/com/ && \
+        echo 'ifixitAppId="com.dozuki.ifixit"' > gradle.properties
+
+Build:2.4.0,45
+    commit=v2.4.0
+    subdir=App
+    gradle=ifixit
+    srclibs=NoAnalytics@eacdf5bcc9
+    prebuild=rm -f libs/* && \
+        mv $$NoAnalytics$$/src/com/* src/com/ && \
+        echo 'ifixitAppId="com.dozuki.ifixit"' > gradle.properties && \
+        echo 'dozukiAppId=""' >> gradle.properties && \
+        echo 'accustreamAppId=""' >> gradle.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.0.1
-Current Version Code:37
+Current Version:2.4.0
+Current Version Code:45
 
diff --git a/metadata/com.dririan.RingyDingyDingy.txt b/metadata/com.dririan.RingyDingyDingy.txt
index bb65685cda..51aff32f89 100644
--- a/metadata/com.dririan.RingyDingyDingy.txt
+++ b/metadata/com.dririan.RingyDingyDingy.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://ringydingydingy.dririan.com/
 Source Code:https://github.com/dririan/ringydingydingy
@@ -28,7 +28,7 @@ Build Version:0.7.4,704,v0.7.4
 Build Version:0.7.5,705,v0.7.5
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:0.7.5
 Current Version Code:705
 
diff --git a/metadata/com.drismo.txt b/metadata/com.drismo.txt
index 220c43ef34..6bca5a8053 100644
--- a/metadata/com.drismo.txt
+++ b/metadata/com.drismo.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/jmyrland/DriSMo
 Source Code:https://github.com/jmyrland/DriSMo
diff --git a/metadata/com.drodin.tuxrider.txt b/metadata/com.drodin.tuxrider.txt
index f3793722ab..ba806b070a 100644
--- a/metadata/com.drodin.tuxrider.txt
+++ b/metadata/com.drodin.tuxrider.txt
@@ -1,4 +1,5 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:GPL
 Web Site:http://tuxrider.drodin.com/
 Source Code:https://github.com/drodin/TuxRider
@@ -25,8 +26,7 @@ Build Version:1.0.9,11,36220e5,forceversion=yes,buildjni=yes,srclibs=MobAdMob@2d
 echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.9
 Current Version Code:11
 
diff --git a/metadata/com.duckduckgo.mobile.android.txt b/metadata/com.duckduckgo.mobile.android.txt
new file mode 100644
index 0000000000..76e7ef8ce0
--- /dev/null
+++ b/metadata/com.duckduckgo.mobile.android.txt
@@ -0,0 +1,38 @@
+Categories:Internet
+License:Apache2
+Web Site:https://duck.co/help/mobile/android
+Source Code:https://github.com/duckduckgo/android
+Issue Tracker:https://github.com/duckduckgo/android/issues
+
+Auto Name:DuckDuckGo
+Summary:Search widget
+Description:
+Search the web via duckduckgo.com, a search engine that's focussed
+on privacy. 
+
+The app also works like a news reader, showing popular stories from a 
+customizable list of websites, until you enter a query.
+
+Works with [[org.torproject.android]] (though not on Android 4.4).
+.
+
+Repo Type:git
+Repo:https://github.com/duckduckgo/android.git
+
+Build:2.1.1,52
+    commit=v2.1.1
+    srclibs=1:NetCipher@4fe34ede3f44d968e55
+
+Build:2.1.2,53
+    commit=v2.1.2
+    srclibs=1:NetCipher@4fe34ede3f44d968e55
+
+Maintainer Notes:
+Uses submodules which can be used to check library commit
+.
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.1.2
+Current Version Code:53
+
diff --git a/metadata/com.dwak.lastcall.txt b/metadata/com.dwak.lastcall.txt
new file mode 100644
index 0000000000..be19c8e3eb
--- /dev/null
+++ b/metadata/com.dwak.lastcall.txt
@@ -0,0 +1,24 @@
+Categories:Phone & SMS
+License:MIT
+Web Site:
+Source Code:https://github.com/dinosaurwithakatana/lastcaller
+Issue Tracker:https://github.com/dinosaurwithakatana/lastcaller/issues
+
+Auto Name:LastCaller
+Name:Dashclock: Last Caller
+Summary:Previous caller on lock screen
+Description:
+Extension for [[net.nurik.roman.dashclock]].
+.
+
+Repo Type:git
+Repo:https://github.com/dinosaurwithakatana/lastcaller.git
+
+Build:2.1,8
+    commit=c0207d37c8ac9a1
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.1
+Current Version Code:8
+
diff --git a/metadata/com.dwalkes.android.toggleheadset2.txt b/metadata/com.dwalkes.android.toggleheadset2.txt
index 7861f47b02..71b0e9242c 100644
--- a/metadata/com.dwalkes.android.toggleheadset2.txt
+++ b/metadata/com.dwalkes.android.toggleheadset2.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://code.google.com/p/toggleheadset2/
-Source Code:https://code.google.com/p/toggleheadset2/source/list
-Issue Tracker:https://code.google.com/p/toggleheadset2/issues/list
+Source Code:https://code.google.com/p/toggleheadset2/source
+Issue Tracker:https://code.google.com/p/toggleheadset2/issues
 Donate:https://code.google.com/p/toggleheadset2/
 
 Auto Name:Toggle Headset 2
diff --git a/metadata/com.dwdesign.tweetings.txt b/metadata/com.dwdesign.tweetings.txt
index cc8e39efe7..4e7c5b7170 100644
--- a/metadata/com.dwdesign.tweetings.txt
+++ b/metadata/com.dwdesign.tweetings.txt
@@ -1,4 +1,4 @@
-Category:None
+Categories:None
 #If you discount the Aviary SDK and missing oAuth credentials
 License:GPLv3
 Web Site:http://tweetings.net/android/source
diff --git a/metadata/com.eddyspace.networkmonitor.txt b/metadata/com.eddyspace.networkmonitor.txt
index 4392cb887e..9915e8d48b 100644
--- a/metadata/com.eddyspace.networkmonitor.txt
+++ b/metadata/com.eddyspace.networkmonitor.txt
@@ -12,7 +12,7 @@ Shows various network status information and optionally logs it to a
 CSV file to assist in troubleshooting.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://anetmon.svn.sourceforge.net/svnroot/anetmon/
 
 Build Version:0.2-beta,2,17
diff --git a/metadata/com.eleybourn.bookcatalogue.txt b/metadata/com.eleybourn.bookcatalogue.txt
index 8d26bc27f4..3572b0c099 100644
--- a/metadata/com.eleybourn.bookcatalogue.txt
+++ b/metadata/com.eleybourn.bookcatalogue.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3+
 Web Site:http://github.com/eleybourn/Book-Catalogue/wiki
 Source Code:http://github.com/eleybourn/Book-Catalogue
diff --git a/metadata/com.elsdoerfer.android.autostarts.txt b/metadata/com.elsdoerfer.android.autostarts.txt
index 357b3baf46..1b9b5ec0b9 100644
--- a/metadata/com.elsdoerfer.android.autostarts.txt
+++ b/metadata/com.elsdoerfer.android.autostarts.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://elsdoerfer.name/=android-autostarts
 Source Code:https://github.com/miracle2k/android-autostarts
@@ -13,18 +13,31 @@ background. Root users can disable unwanted autostarts and speed up their phone
 Requires Root: No. However, to make changes you will need root.
 .
 
-#Requires Root:No
 Repo Type:git
 Repo:https://github.com/miracle2k/android-autostarts.git
 
-Build Version:1.7.5,22,1.7.5,extlibs=android/android-support-v4.jar,prebuild=\
-echo "source.dir=src;src-opt/default" > ant.properties
+Build:1.7.5,22
+    commit=1.7.5
+    disable=build fail
+
 # This version was only published by author on Vodafone without root but seems to be fine
-Build Version:1.7.7,24,1.7.7,extlibs=android/android-support-v4.jar,prebuild=\
-mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
+Build:1.7.7,24
+    commit=1.7.7
+    extlibs=android/android-support-v4.jar
+    prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
+
+Build:1.8.0,25
+    commit=1.8.0
+    extlibs=android/android-support-v4.jar
+    prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
+
+Build:1.8.1,26
+    commit=1.8.1
+    extlibs=android/android-support-v4.jar
+    prebuild=mv src-opt/default/src/com/elsdoerfer/android/autostarts/* src/com/elsdoerfer/android/autostarts/
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.7.7
-Current Version Code:24
+Current Version:1.8.1
+Current Version Code:26
 
diff --git a/metadata/com.elsewhat.android.currentwallpaper.txt b/metadata/com.elsewhat.android.currentwallpaper.txt
new file mode 100644
index 0000000000..1dca62e677
--- /dev/null
+++ b/metadata/com.elsewhat.android.currentwallpaper.txt
@@ -0,0 +1,23 @@
+Categories:Wallpaper
+License:Apache2
+Web Site:
+Source Code:https://github.com/elsewhat/com.elsewhat.android.currentwallpaper
+Issue Tracker:https://github.com/elsewhat/com.elsewhat.android.currentwallpaper/issues
+
+Auto Name:Current Wallpaper
+Summary:Display wallpapers as standalone
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/elsewhat/com.elsewhat.android.currentwallpaper.git
+
+Build:1.0,2
+    commit=f9cc
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:2
+
diff --git a/metadata/com.emartynov.android.app.urlsetter.txt b/metadata/com.emartynov.android.app.urlsetter.txt
new file mode 100644
index 0000000000..ccfd461571
--- /dev/null
+++ b/metadata/com.emartynov.android.app.urlsetter.txt
@@ -0,0 +1,26 @@
+Categories:Internet
+License:Apache2
+Web Site:
+Source Code:https://github.com/emartynov/UrlSetter
+Issue Tracker:https://github.com/emartynov/UrlSetter/issues
+
+Auto Name:Link Setter
+Summary:Peek at shortened addresses
+Description:
+Decode short urls from many popular websites, which can then be passed to your 
+app of choice.
+.
+
+Repo Type:git
+Repo:https://github.com/emartynov/UrlSetter.git
+
+Build:1.0.0.1,1
+    disable=wait for official release
+    commit=5168e722e9d1
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.0.8
+Current Version Code:6
+
diff --git a/metadata/com.eolwral.osmonitor.txt b/metadata/com.eolwral.osmonitor.txt
index a3cc936ee7..206a2f9ce5 100644
--- a/metadata/com.eolwral.osmonitor.txt
+++ b/metadata/com.eolwral.osmonitor.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/eolwral/OSMonitor
@@ -19,40 +19,89 @@ Repo Type:git
 #Repo:https://code.google.com/p/android-os-monitor.osmonitor/
 Repo:https://github.com/eolwral/OSMonitor
 
-Build Version:2.0.5,28,cee4327bfe56,buildjni=yes,subdir=OSMonitor,\
-patch=no-gmaps.patch;name-no-gmaps.patch
-Build Version:3.0.6.4,41,667a709a0,encoding=latin1,\
-subdir=OSMonitor,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's/osinfo/osInfo/g' jni/include/core/os.h && \
-sed -i 's/ConnectionInfo.pb.h/connectionInfo.pb.h/g' \
-jni/include/core/connection.h,build=$$NDK$$/ndk-build && \
-mv libs/armeabi/osmcore assets/osmcore_arm && \
-mv libs/x86/osmcore assets/osmcore_x86,buildjni=no
-Build Version:3.0.6.5,42,330fc16,subdir=OSMonitor,\
-extlibs=android/android-support-v4.jar,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties,\
-build=$$NDK$$/ndk-build && mv libs/armeabi/osmcore assets/osmcore_arm && \
-mv libs/x86/osmcore assets/osmcore_x86,buildjni=no
-Build Version:3.0.6.6,43,3.0.6.6,subdir=OSMonitor,\
-extlibs=android/android-support-v4.jar,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties,\
-build=$$NDK$$/ndk-build && mv libs/armeabi/osmcore assets/osmcore_arm && \
-mv libs/x86/osmcore assets/osmcore_x86,buildjni=no
-Build Version:3.0.7.0,48,3.0.7.0,subdir=OSMonitor,\
-extlibs=android/android-support-v4.jar,srclibs=ActionBarSherlock@4.4.0,\
-prebuild=\
-	mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-	sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties,\
-build=\
-	$$NDK$$/ndk-build && mv libs/armeabi/osmcore assets/osmcore_arm && \
-	mv libs/x86/osmcore assets/osmcore_x86,buildjni=no
+Build:2.0.5,28
+    commit=cee4327bfe56
+    subdir=OSMonitor
+    patch=no-gmaps.patch;name-no-gmaps.patch
+    buildjni=yes
+
+Build:3.0.6.4,41
+    commit=667a709a0
+    subdir=OSMonitor
+    encoding=latin1
+    srclibs=1:ActionBarSherlock@4.3.1
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's/osinfo/osInfo/g' jni/include/core/os.h && \
+        sed -i 's/ConnectionInfo.pb.h/connectionInfo.pb.h/g' jni/include/core/connection.h
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Build:3.0.6.5,42
+    commit=330fc16
+    subdir=OSMonitor
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.3.1
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Build:3.0.6.6,43
+    commit=3.0.6.6
+    subdir=OSMonitor
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.3.1
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Build:3.0.7.0,48
+    disable=doesn't show any data
+    commit=3.0.7.0
+    subdir=OSMonitor
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Build:3.0.7.2,50
+    commit=3.0.7.2
+    subdir=OSMonitor
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Build:3.0.8.2,53
+    commit=3.0.8.2
+    subdir=OSMonitor
+    scanignore=OSMonitor/assets/osmcore_arm
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1;2:Volley@android-4.4_r1.2
+    extlibs=android/android-support-v4.jar
+    prebuild=mv libs/android-support-v4.jar $$Support$$/libs/
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/osmcore assets/osmcore_arm && \
+        mv libs/x86/osmcore assets/osmcore_x86
+    buildjni=no
+
+Maintainer Notes:
+Could support additional CPU architectures and lose the scanignore by building
+the stuff in /jni and moving the three outputs to /assets.
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:3.0.7.2
-Current Version Code:50
+Current Version:3.0.8.2
+Current Version Code:53
 
diff --git a/metadata/com.episode6.android.appalarm.pro.txt b/metadata/com.episode6.android.appalarm.pro.txt
index de2a8fc49f..6a774d02e2 100644
--- a/metadata/com.episode6.android.appalarm.pro.txt
+++ b/metadata/com.episode6.android.appalarm.pro.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:http://episode6.wordpress.com/2010/03/27/appalarm/
 Source Code:https://github.com/ghackett/AppAlarm
@@ -18,8 +18,7 @@ Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a,target=android-1
 Build Version:1.2.7,31,80846d90832,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.7
 Current Version Code:31
 
diff --git a/metadata/com.euedge.openaviationmap.android.txt b/metadata/com.euedge.openaviationmap.android.txt
new file mode 100644
index 0000000000..5a94fa7c37
--- /dev/null
+++ b/metadata/com.euedge.openaviationmap.android.txt
@@ -0,0 +1,30 @@
+Category:Navigation
+License:GPLv3
+Web Site:http://www.openaviationmap.org
+Source Code:https://code.google.com/p/openaviationmap/source
+Issue Tracker:https://code.google.com/p/openaviationmap/issues
+Donate:http://www.openaviationmap.org
+Bitcoin:07a7194397ae0f8d40740488472a43fd
+
+Summary:Display aviation maps
+Description:
+Part of project to develop an aviation equivalent of OSM.
+Downloadable maps are currently limited to Hungary 
+at the time of writing.
+.
+
+Repo Type:git-svn
+Repo:http://openaviationmap.googlecode.com/svn;trunk=trunk/oam-app-android;tags=tags/oam-app-android
+
+Build Version:1.0.16,16,16-1.0.16,\
+srclibs=1:ActionBarSherlock@e5c2d1c,\
+extlibs=android/android-support-v4r12.jar,\
+prebuild=\
+mv libs/android-support-v4r12.jar $$ActionBarSherlock$$/libs/android-support-v4.jar && \
+sed -i '/2/d' project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.16
+Current Version Code:16
+
diff --git a/metadata/com.evancharlton.mileage.txt b/metadata/com.evancharlton.mileage.txt
index 0953e78360..35fca96f9b 100644
--- a/metadata/com.evancharlton.mileage.txt
+++ b/metadata/com.evancharlton.mileage.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://evancharlton.com/projects/mileage/source
-Source Code:http://code.google.com/p/android-mileage/source/checkout
-Issue Tracker:http://code.google.com/p/android-mileage/issues/list
+Source Code:http://code.google.com/p/android-mileage/source
+Issue Tracker:http://code.google.com/p/android-mileage/issues
 Donate:http://evancharlton.com/donate/
 
 Auto Name:Mileage
@@ -23,8 +23,7 @@ Build Version:3.1.0,3100,e0e7b5de827b,subdir=trunk
 Build Version:3.1.1,3110,2f32257a5216,subdir=trunk
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:3.1.1
 Current Version Code:3110
 
diff --git a/metadata/com.everysoft.autoanswer.txt b/metadata/com.everysoft.autoanswer.txt
index ba4c5b66e7..bdd57da786 100644
--- a/metadata/com.everysoft.autoanswer.txt
+++ b/metadata/com.everysoft.autoanswer.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://code.google.com/p/auto-answer/
-Source Code:http://code.google.com/p/auto-answer/source/checkout
-Issue Tracker:http://code.google.com/p/auto-answer/issues/list
+Source Code:http://code.google.com/p/auto-answer/source
+Issue Tracker:http://code.google.com/p/auto-answer/issues
 
 Auto Name:AutoAnswer
 Summary:Auto-answer phone calls
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index 4e26661c3f..8ff5beb73d 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:EPL
 Web Site:http://code.google.com/p/lcarswallpaper/
-Source Code:http://code.google.com/p/lcarswallpaper/source/checkout
-Issue Tracker:http://code.google.com/p/lcarswallpaper/issues/list
+Source Code:http://code.google.com/p/lcarswallpaper/source
+Issue Tracker:http://code.google.com/p/lcarswallpaper/issues
 
 Auto Name:LCARS Wallpapers
 Summary:Star Trek style background
@@ -11,7 +11,7 @@ Star Trek LCARS themed live wallpaper for Android 2.1+ devices that shows
 various system information.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://lcarswallpaper.googlecode.com/svn/trunk/lcarswallpaper
 
 # The manifest has no version code, so let's use the SVN revision number.
diff --git a/metadata/com.example.anycut.txt b/metadata/com.example.anycut.txt
index 9359ac3cbc..08eb58e87f 100644
--- a/metadata/com.example.anycut.txt
+++ b/metadata/com.example.anycut.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/apps-for-android/
-Source Code:http://code.google.com/p/apps-for-android/source/checkout
-Issue Tracker:http://code.google.com/p/apps-for-android/issues/list
+Source Code:http://code.google.com/p/apps-for-android/source
+Issue Tracker:http://code.google.com/p/apps-for-android/issues
 
 Auto Name:Any Cut
 Summary:Create shortcuts for anything
diff --git a/metadata/com.f.coin.txt b/metadata/com.f.coin.txt
index 584f2b4230..01c00e5143 100644
--- a/metadata/com.f.coin.txt
+++ b/metadata/com.f.coin.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://fcoin.de/index.php
 Source Code:https://github.com/PrXenon/fcoin
diff --git a/metadata/com.f2prateek.dfg.txt b/metadata/com.f2prateek.dfg.txt
index 6613ba60cf..6916f64282 100644
--- a/metadata/com.f2prateek.dfg.txt
+++ b/metadata/com.f2prateek.dfg.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:
 Source Code:https://github.com/f2prateek/Device-Frame-Generator
@@ -12,18 +12,35 @@ The device frame generator allows you to quickly wrap your app screenshots in
 real device artwork, providing better context for your screenshots.
 You can generate screenshots through sharing in Android,
 as well as perform batch operations.
+
+This app will no longer be updated; Upstream started using proprietary libraries heavily.
 .
 
 Repo Type:git
 Repo:https://github.com/f2prateek/Device-Frame-Generator.git
 
-Build Version:1.0.7,107,v1.0.7,subdir=app,gradle=yes
-Build Version:1.1.0,110,v1.1.0,subdir=app,gradle=yes
-Build Version:1.1.2,112,v1.1.2,subdir=app,gradle=yes
-Build Version:1.1.3,113,v1.1.3,subdir=app,gradle=yes
+Build:1.0.7,107
+    commit=v1.0.7
+    subdir=app
+    gradle=yes
+
+Build:1.1.0,110
+    commit=v1.1.0
+    subdir=app
+    gradle=yes
+
+Build:1.1.2,112
+    commit=v1.1.2
+    subdir=app
+    gradle=yes
+
+Build:1.1.3,113
+    commit=v1.1.3
+    subdir=app
+    gradle=yes
 
 Auto Update Mode:None
-Update Check Mode:Tags
+Update Check Mode:Static
 Current Version:1.1.3
 Current Version Code:113
 
diff --git a/metadata/com.falconware.prestissimo.txt b/metadata/com.falconware.prestissimo.txt
new file mode 100644
index 0000000000..7aba6a3dd1
--- /dev/null
+++ b/metadata/com.falconware.prestissimo.txt
@@ -0,0 +1,28 @@
+Categories:Multimedia
+License:LGPL
+Web Site:
+Source Code:https://github.com/TheRealFalcon/Prestissimo
+Issue Tracker:https://github.com/TheRealFalcon/Prestissimo/issues
+
+Auto Name:Prestissimo
+Summary:Change the speed of playback
+Description:
+Adds variable speed playback functionality to audio applications,
+e.g. [[de.danoeh.antennapod]].
+.
+
+Repo Type:git
+Repo:https://github.com/TheRealFalcon/Prestissimo.git
+
+Build:0.5,10
+    commit=v0.5
+    target=android-17
+    srclibs=Sonic@637de
+    build=$$NDK$$/ndk-build -C $$Sonic$$ && \
+        mv $$Sonic$$/libs/armeabi* libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.5
+Current Version Code:10
+
diff --git a/metadata/com.fgrim.msnake.txt b/metadata/com.fgrim.msnake.txt
new file mode 100644
index 0000000000..bcc6c6cd31
--- /dev/null
+++ b/metadata/com.fgrim.msnake.txt
@@ -0,0 +1,19 @@
+Categories:Games
+License:Apache2
+Web Site:http://fgrim.com/msnake
+Source Code:https://gitorious.org/f-droid-mirrors/msnake/source/master
+
+Summary:Classic snake game
+Description:
+The classic snake game.
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/f-droid-mirrors/msnake.git
+
+Build Version:1.6,7,v1.6,target=android-8
+
+Update Check Mode:Tags
+Current Version:1.6
+Current Version Code:7
+
diff --git a/metadata/com.fivasim.antikythera.txt b/metadata/com.fivasim.antikythera.txt
index 081bce4176..1bdcc2525d 100644
--- a/metadata/com.fivasim.antikythera.txt
+++ b/metadata/com.fivasim.antikythera.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:FreeBSD
 Web Site:http://fivasim.pcriot.com/antikythera.html
 Source Code:https://github.com/fivasim/Antikythera-Simulation
@@ -20,8 +20,7 @@ Repo:https://github.com/fivasim/Antikythera-Simulation.git
 Build Version:0.97,5,787a3e13fe,subdir=Antikythera
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.97
 Current Version Code:5
 
diff --git a/metadata/com.frankcalise.h2droid.txt b/metadata/com.frankcalise.h2droid.txt
new file mode 100644
index 0000000000..c3c89de954
--- /dev/null
+++ b/metadata/com.frankcalise.h2droid.txt
@@ -0,0 +1,21 @@
+Category:Science & Education
+License:Apache2
+Source Code:https://code.google.com/p/h2droid/source
+Issue Tracker:https://code.google.com/p/h2droid/issues
+
+Auto Name:Hydrate
+Summary:Set targets for water intake
+Description:
+.
+
+Repo Type:git-svn
+Repo:http://h2droid.googlecode.com/svn;trunk=trunk;tags=tags
+
+Build Version:1.5,10,release-1.5,\
+prebuild=sed -i '12s/true/false/g' AndroidManifest.xml
+
+Auto Update Mode:
+Update Check Mode:Tags
+Current Version:1.5
+Current Version Code:10
+
diff --git a/metadata/com.frostwire.android.txt b/metadata/com.frostwire.android.txt
index 1c7dfb40e9..c1c3b434eb 100644
--- a/metadata/com.frostwire.android.txt
+++ b/metadata/com.frostwire.android.txt
@@ -1,10 +1,9 @@
-AntiFeatures:Tracking
-Category:Internet
+AntiFeatures:UpstreamNonFree,Tracking
+Categories:Internet
 License:GPLv3
 Web Site:https://frostwire.com/android
 Source Code:https://github.com/frostwire/frostwire-android
 Issue Tracker:https://github.com/frostwire/frostwire-android/issues
-Donate:https://gumroad.com/l/oox
 
 Auto Name:FrostWire
 Summary:File-sharing and searching
@@ -15,35 +14,47 @@ on the same local network (via WiFi). Frostwire can also be installed on
 the desktop.
 
 The non-free Google Admob library in the source code has been replaced with a
-library
-that does nothing.
+library that does nothing. The presence of even more proprietary libraries in
+newer versions means that there are unlikely to be further updates of this
+app in the F-Droid repo.
 
 Anti-feature: Tracking. The app checks for new versions of the app without the
-user's consent.
-The update won't work however, because it is signed with a different key to
-these apks.
+user's consent. The update won't work however, because it is signed with a
+different key to these apks.
 .
 
 Repo Type:git
 Repo:https://github.com/frostwire/frostwire-android.git
 
-Build Version:0.9.14,75,6db095c85f4,srclibs=MobAdMob@2d5736,target=android-13,prebuild=\
-rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \
-echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties
-Build Version:1.0.5,81,852b155461,srclibs=MobAdMob@2d5736,target=android-13,prebuild=\
-rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \
-echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties
-Build Version:1.0.7,85,b1a6dde89,encoding=utf-8,srclibs=MobAdMob@2d5736,target=android-13,prebuild=\
-rm -f libs/GoogleAdMob* && echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-echo "source.dir=src;common/components" >> ant.properties
-Build Version:1.1.1,96,!WIP patch at 1.1.1-b96,encoding=utf-8,\
-patch=update.patch;offercasts.patch,prebuild=\
-rm libs/offercast-mobile-sdk.jar && \
-echo "source.dir=src;common/components" >> ant.properties
+Build:0.9.14,75
+    commit=6db095c85f4
+    target=android-13
+    srclibs=MobAdMob@2d5736
+    prebuild=rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \
+        echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties
+
+Build:1.0.5,81
+    commit=852b155461
+    target=android-13
+    srclibs=MobAdMob@2d5736
+    prebuild=rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \
+        echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties
+
+Build:1.0.7,85
+    commit=b1a6dde89
+    target=android-13
+    encoding=utf-8
+    srclibs=MobAdMob@2d5736
+    prebuild=rm -f libs/GoogleAdMob* && \
+        echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "source.dir=src;common/components" >> ant.properties
+
+Maintainer Notes:
+No further updates - see description.
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.1
-Current Version Code:96
+Update Check Mode:Static
+Current Version:1.0.7
+Current Version Code:85
 
diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 6c441bc855..4c01614d36 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -1,9 +1,10 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://code.google.com/p/k9mail/
 Source Code:https://github.com/k9mail/k-9
-Issue Tracker:http://code.google.com/p/k9mail/issues/list
+Issue Tracker:http://code.google.com/p/k9mail/issues
 
+Provides:org.fdroid.k9
 Auto Name:K-9 Mail
 Summary:Full-featured email client
 Description:
diff --git a/metadata/com.funambol.androidsync.txt b/metadata/com.funambol.androidsync.txt
index 6b7b657369..c811dc56d7 100644
--- a/metadata/com.funambol.androidsync.txt
+++ b/metadata/com.funambol.androidsync.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:AGPLv3
 Web Site:http://www.funambol.com
 Source Code:https://funambol.svn.sourceforge.net/viewvc/funambol/android-client/trunk/android-client
@@ -8,32 +8,10 @@ Summary:Personal cloud sync client
 Description:
 Funambol sync client.
 
-Status: We haven't been able to build the most recent version of this which
-is now called FunV10 with package id com.funambol.funv10. Not much has changed
-though it does have calendar support. That would be the
-"community edition" of the app that uses the current package id.
+Status: This has been replaced upstream with a different package
+(com.funambol.funv10), which we are unable to build currently.
 .
 
-Repo Type:svn
-Repo:https://funambol.svn.sourceforge.net/svnroot/funambol/android-client/trunk/android-client
-
-#Build Version:8.7.3,8,1032,subdir=tags/8.7.3,update=no,initfun=yes
-#Build Version:9.0.1,9,1437,subdir=tags/9.0.1,update=no,initfun=yes
-#Build Version:9.0.3,10,1547,subdir=tags/9.0.3,update=no,initfun=yes
-#Build Version:10.0.4,14,2162,subdir=tags/10.0.4,update=no,initfun=yes
-#Build Version:10.0.5,15,2211,subdir=tags/10.0.5,update=no,initfun=yes
-#Build Version:10.0.6,16,2337,subdir=tags/10.0.6,update=no,initfun=yes
-#Source inaccessible for the last few days:
-# svn: Can't open file 'branches/us6260v87/src/com/funambol/android/source/pim/.svn/lock': No space left on device
-#Source is now accessible, but the build is failing without an obvious error.
-#Build Version:10.0.7,17,2671,subdir=tags/10.0.7,update=no,initfun=yes
-Build Version:10.1.3,22,!svn problems 3572,update=no,initfun=yes
-#Build Version:11.0.14,34,!source code not accessible
-Build Version:11.0.15,35,!initfun problems/can't find junit 59690,update=no,initfun=yes
-
 Auto Update Mode:None
-#get Current from Google Play com.funambol.funv10
 Update Check Mode:None
-Current Version:10.1.3
-Current Version Code:22
 
diff --git a/metadata/com.futonredemption.mylocation.txt b/metadata/com.futonredemption.mylocation.txt
index 932d02eb70..d1c3a8e9ba 100644
--- a/metadata/com.futonredemption.mylocation.txt
+++ b/metadata/com.futonredemption.mylocation.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:NewBSD
 Web Site:http://code.google.com/p/futonic-mylocationwidget/
-Source Code:http://code.google.com/p/futonic-mylocationwidget/source/checkout
-Issue Tracker:http://code.google.com/p/futonic-mylocationwidget/issues/list
+Source Code:http://code.google.com/p/futonic-mylocationwidget/source
+Issue Tracker:http://code.google.com/p/futonic-mylocationwidget/issues
 
 Auto Name:My Location Widget
 Summary:Homescreen widget
@@ -14,12 +14,10 @@ share it or view it on Flickr, Google Maps or GeoHack
 Repo Type:hg
 Repo:https://code.google.com/p/futonic-mylocationwidget/
 
-#I didn't have android-13
 Build Version:6.0,60,7462918ed401,target=android-14
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:6.0
 Current Version Code:60
 
diff --git a/metadata/com.gcstar.scanner.txt b/metadata/com.gcstar.scanner.txt
index a80f253271..1e0f0c2577 100644
--- a/metadata/com.gcstar.scanner.txt
+++ b/metadata/com.gcstar.scanner.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2+
 Web Site:http://wiki.gcstar.org/en/gcstar_scanner
 Source Code:http://svn.gna.org/viewcvs/gcstar/scanner/
diff --git a/metadata/com.gcstar.viewer.txt b/metadata/com.gcstar.viewer.txt
index 5c3d97f866..b2c020449d 100644
--- a/metadata/com.gcstar.viewer.txt
+++ b/metadata/com.gcstar.viewer.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2+
 Web Site:http://wiki.gcstar.org/en/gcstar_viewer
 Source Code:http://svn.gna.org/viewcvs/gcstar/viewer/
diff --git a/metadata/com.gelakinetic.mtgfam.txt b/metadata/com.gelakinetic.mtgfam.txt
index 65efca571c..6231d9d5d6 100644
--- a/metadata/com.gelakinetic.mtgfam.txt
+++ b/metadata/com.gelakinetic.mtgfam.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/mtg-familiar
-Source Code:https://code.google.com/p/mtg-familiar/source/list
-Issue Tracker:https://code.google.com/p/mtg-familiar/issues/list
+Source Code:https://code.google.com/p/mtg-familiar/source
+Issue Tracker:https://code.google.com/p/mtg-familiar/issues
 Donate:https://code.google.com/p/mtg-familiar
 
 Auto Name:MTG Familiar
diff --git a/metadata/com.gh4a.txt b/metadata/com.gh4a.txt
index 2d85ae96f1..b3237ea068 100644
--- a/metadata/com.gh4a.txt
+++ b/metadata/com.gh4a.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:https://github.com/slapperwan/gh4a
 Source Code:https://github.com/slapperwan/gh4a
diff --git a/metadata/com.ghostsq.commander.samba.txt b/metadata/com.ghostsq.commander.samba.txt
index 79662b4386..2a826c2e7d 100644
--- a/metadata/com.ghostsq.commander.samba.txt
+++ b/metadata/com.ghostsq.commander.samba.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
 Source Code:http://sourceforge.net/p/gc-samba/code/
@@ -23,26 +23,44 @@ password. A passwordless Windows account might not work.
 Repo Type:git-svn
 Repo:http://svn.code.sf.net/p/gc-samba/code/
 
-Build Version:1.21.3b1,47,!dexclassloader crash: see forum (at 102),init=rm -rf gen/ && \
-svn co -r407 https://ghostcommander.svn.sourceforge.net/svnroot/ghostcommander gc,\
-extlibs=jcifs/jcifs-1.3.17.jar,\
-scanignore=build/com.ghostsq.commander.samba,prebuild=\
-sed -i 's/Utils.getCause( e )/e.getMessage()/' \
-src/com/ghostsq/commander/samba/SMBAdapter.java,build=\
-ant release -f gc/build.xml && cd libs/ && \
-cp -a ../gc/bin/classes/com . && zip -r -9 gc.jar com/ && rm -rf com/
+Build:1.21.3b1,47
+    disable=dexclassloader crash: see forum (at 102)
+    commit=102
+    init=rm -rf gen/ && \
+        svn co -r407 https://ghostcommander.svn.sourceforge.net/svnroot/ghostcommander gc
+    extlibs=jcifs/jcifs-1.3.17.jar
+    prebuild=sed -i 's/Utils.getCause( e )/e.getMessage()/' src/com/ghostsq/commander/samba/SMBAdapter.java
+    build=ant release -f gc/build.xml && \
+        cd libs/ && \
+        cp -a ../gc/bin/classes/com . && \
+        zip -r -9 gc.jar com/ && \
+        rm -rf com/
 
-Build Version:1.21.3,50,!Build problems
+Build:1.21.3,50
+    disable=Build problems
+    commit=unknown - see disabled
+
+Build:1.30,51
+    commit=106
+    extlibs=jcifs/jcifs-1.3.17.jar;custom_rules.xml
+    srclibs=GhostCommander@390
+    build=mv libs/custom_rules.xml . && \
+        ant debug -f $$GhostCommander$$/build.xml && \
+        jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+        install -D gc.jar libs/gc.jar
+
+Build:1.31,52
+    commit=108
+    extlibs=jcifs/jcifs-1.3.17.jar;custom_rules.xml
+    srclibs=GhostCommander@390
+    build=mv libs/custom_rules.xml . && \
+        ant debug -f $$GhostCommander$$/build.xml && \
+        jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+        install -D gc.jar libs/gc.jar
 
-Build Version:1.30,51,106,srclibs=GhostCommander@390,\
-extlibs=jcifs/jcifs-1.3.17.jar;custom_rules.xml,\
-build=\
-  mv libs/custom_rules.xml . && ant debug -f $$GhostCommander$$/build.xml && \
-  jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
-  install -D gc.jar libs/gc.jar
 
 Auto Update Mode:None
-Update Check Mode:AndroidManifest
-Current Version:1.30
-Current Version Code:51
+Update Check Mode:RepoManifest
+Current Version:1.31
+Current Version Code:52
 
diff --git a/metadata/com.ghostsq.commander.sftp.txt b/metadata/com.ghostsq.commander.sftp.txt
index fd89f10876..e13794f483 100644
--- a/metadata/com.ghostsq.commander.sftp.txt
+++ b/metadata/com.ghostsq.commander.sftp.txt
@@ -1,11 +1,11 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
 Source Code:http://sourceforge.net/p/gc-sftp/code/
 Issue Tracker:http://sourceforge.net/p/ghostcommander/_list/tickets/
 Donate:http://sourceforge.net/p/ghostcommander/donate/
 
-Auto Name:Ghost Commander - Samba plugin
+Auto Name:Ghost Commander - SFTP plugin
 Summary:Access files over SFTP
 Description:
 A plug-in for [[com.ghostsq.commander]] to access secure FTP sites.
@@ -19,18 +19,37 @@ Enter your server name and credentials.
 Repo Type:git-svn
 Repo:http://svn.code.sf.net/p/gc-sftp/code/trunk
 
-# Few different forks of used SSH2 library exist, but https://code.google.com/p/ganymed-ssh-2/
-# (which is in turn referenced by number of sites) claims, that it is the most genuine one
-Build Version:1.10b1,11,26,srclibs=GhostCommander@390,\
-extlibs=ganymed-ssh/ganymed-ssh2-build210.jar;custom_rules.xml,\
-build=\
-  sed 's/jcifs-1.3.17/ganymed-ssh2-build210/' libs/custom_rules.xml > custom_rules.xml && \
-  ant debug -f $$GhostCommander$$/build.xml && \
-  jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
-  install -D gc.jar libs/gc.jar
+Build:1.10b1,11
+    commit=26
+    extlibs=ganymed-ssh/ganymed-ssh2-build210.jar;custom_rules.xml
+    srclibs=GhostCommander@390
+    build=sed 's/jcifs-1.3.17/ganymed-ssh2-build210/' libs/custom_rules.xml > custom_rules.xml && \
+        ant debug -f $$GhostCommander$$/build.xml && \
+        jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+        install -D gc.jar libs/gc.jar
+
+Build:1.11b1,12
+    commit=28
+    extlibs=ganymed-ssh/ganymed-ssh2-build210.jar;custom_rules.xml
+    srclibs=GhostCommander@390
+    build=sed 's/jcifs-1.3.17/ganymed-ssh2-build210/' libs/custom_rules.xml > custom_rules.xml && \
+        ant debug -f $$GhostCommander$$/build.xml && \
+        jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+        install -D gc.jar libs/gc.jar
+
+Build:1.11b3,13
+    commit=30
+    disable=Doesn't compile
+
+Maintainer Notes:
+No commit comments whatsoever!
+
+Few different forks of used SSH2 library exist, but https://code.google.com/p/ganymed-ssh-2/
+(which is in turn referenced by number of sites) claims, that it is the most genuine one
+.
 
 Auto Update Mode:None
-Update Check Mode:AndroidManifest
-Current Version:1.10b1
-Current Version Code:11
+Update Check Mode:RepoManifest
+Current Version:1.11b3
+Current Version Code:13
 
diff --git a/metadata/com.ghostsq.commander.txt b/metadata/com.ghostsq.commander.txt
index f96d255d89..ef86fba494 100644
--- a/metadata/com.ghostsq.commander.txt
+++ b/metadata/com.ghostsq.commander.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
 Source Code:http://sourceforge.net/p/ghostcommander/code/
@@ -27,25 +27,65 @@ and mess around with the system files.
 Repo Type:srclib
 Repo:GhostCommander
 
-Build Version:1.35.1b5,97,141,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
+Build:1.35.1b5,97
+    commit=141
+    prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
+
 # All commit messages are empty, so I'm just guessing the revision.
-Build Version:1.35,94,131,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
-Build Version:1.36.4,110,161,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
-Build Version:1.40,160,302,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
-Build Version:1.40.1,163,307
-Build Version:1.40.2,164,314
+Build:1.35,94
+    commit=131
+    prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
+
+Build:1.36.4,110
+    commit=161
+    prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
+
+Build:1.40,160
+    commit=302
+    prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
+
+Build:1.40.1,163
+    commit=307
+
+Build:1.40.2,164
+    commit=314
+
 # DexClassLoader seems to be used for the samba/sftp plugins
-Build Version:1.43.3b1,210,407,\
-scanignore=build/com.ghostsq.commander/src/com/ghostsq/commander/adapters/CA.java
-Build Version:1.50.1,214,387,scanignore=src/com/ghostsq/commander/adapters/CA.java
-Build Version:1.51b2,219,390,scanignore=src/com/ghostsq/commander/adapters/CA.java
+Build:1.43.3b1,210
+    commit=407
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Build:1.50.1,214
+    commit=387
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Build:1.51b2,219
+    commit=390
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Build:1.51b6,223
+    commit=398
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Build:1.51b7,224
+    commit=402
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Build:1.51.4b4,232
+    disable=Build fails - missing R.drawable.plugins
+    commit=410
+    scanignore=src/com/ghostsq/commander/adapters/CA.java
+
+Maintainer Notes:
+No commit messages in source repo! No tags. Apks on website can be used to
+confirm a release is real. Commit where AndroidManifest is changed usually
+corresponds to version.
+
+The scanignore is for the dex class loading which is used for loading plugins.
+.
 
 Auto Update Mode:None
-# also on gplay; apks on website
-Update Check Mode:AndroidManifest
-Current Version:1.51b2
-Current Version Code:219
+Update Check Mode:RepoManifest
+Current Version:1.51.4b4
+Current Version Code:232
+
diff --git a/metadata/com.gimranov.zandy.app.txt b/metadata/com.gimranov.zandy.app.txt
index 696cc569f9..8ccc45bb93 100644
--- a/metadata/com.gimranov.zandy.app.txt
+++ b/metadata/com.gimranov.zandy.app.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:AGPLv3
 Web Site:http://www.gimranov.com/avram/w/zandy-user-guide
 Source Code:https://github.com/ajlyon/zandy
diff --git a/metadata/com.ginkel.hashit.txt b/metadata/com.ginkel.hashit.txt
index 75600b0ba9..566f025bc6 100644
--- a/metadata/com.ginkel.hashit.txt
+++ b/metadata/com.ginkel.hashit.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://android.ginkel.com
 Source Code:https://github.com/ginkel/hashit
diff --git a/metadata/com.github.alijc.cricketsalarm.txt b/metadata/com.github.alijc.cricketsalarm.txt
new file mode 100644
index 0000000000..72ea119fa0
--- /dev/null
+++ b/metadata/com.github.alijc.cricketsalarm.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:GPLv3
+Web Site:https://github.com/alijc/CricketsAlarm
+Source Code:https://github.com/alijc/CricketsAlarm
+Issue Tracker:https://github.com/alijc/CricketsAlarm/issues
+
+Summary:Pet medication alarm
+Description:
+A widget for keeping track of a pet’s medications.
+.
+
+Repo Type:git
+Repo:https://github.com/alijc/CricketsAlarm.git
+
+Build:1.1,2
+    commit=f498c8dc31
+    subdir=CricketsAlarm
+    target=android-14
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.github.andlyticsproject.txt b/metadata/com.github.andlyticsproject.txt
index f921334f0e..60be8e960f 100644
--- a/metadata/com.github.andlyticsproject.txt
+++ b/metadata/com.github.andlyticsproject.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:https://github.com/AndlyticsProject/andlytics
 Source Code:https://github.com/AndlyticsProject/andlytics
diff --git a/metadata/com.github.cetoolbox.txt b/metadata/com.github.cetoolbox.txt
new file mode 100644
index 0000000000..d67eca5323
--- /dev/null
+++ b/metadata/com.github.cetoolbox.txt
@@ -0,0 +1,23 @@
+Category:Science & Education
+License:Apache2
+Web Site:http://pansanel.github.io/cetoolbox
+Source Code:https://github.com/Pansanel/cetoolbox
+Issue Tracker:https://github.com/Pansanel/cetoolbox/issues
+
+Auto Name:CEToolbox
+Summary:Medical tool
+Description:
+The CEToolbox project aims to provide a convenient tool for computing
+Capillary Electrophoresis parameters.
+.
+
+Repo Type:git
+Repo:https://github.com/Pansanel/cetoolbox.git
+
+Build Version:1.0,1,ed60c
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/com.github.egonw.isotopes.txt b/metadata/com.github.egonw.isotopes.txt
index c75254eac1..bbdf659a90 100644
--- a/metadata/com.github.egonw.isotopes.txt
+++ b/metadata/com.github.egonw.isotopes.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/chemicalappspace/Isotopes
 Source Code:https://github.com/chemicalappspace/Isotopes
diff --git a/metadata/com.github.grimpy.botifier.txt b/metadata/com.github.grimpy.botifier.txt
new file mode 100644
index 0000000000..8740b3bec4
--- /dev/null
+++ b/metadata/com.github.grimpy.botifier.txt
@@ -0,0 +1,44 @@
+Categories:System
+License:MIT
+Web Site:http://forum.xda-developers.com/showthread.php?t=2421357
+Source Code:https://github.com/grimpy/Botifier
+Issue Tracker:https://github.com/grimpy/Botifier/issues
+
+Auto Name:Botifier
+Summary:Send notifications via Bluetooth
+Description:
+* Show notifcations on car radio 
+* Show application as artist
+* Show summary as album
+* Show full notification text as title (can be split over multiple chunks max length is configurable)
+* Play notification via TTS (text to speech)
+* Use next / previous track to navigate through notifications
+* Use pause / play button to remove notifcation
+* Use forward button to close notification stream might help to regain focus to previous playing audio.
+
+To test if your media device (car radio) supports AVRCP 1.3 play a mp3 song 
+which has id3 information set and check if this information is shown on the 
+media device.
+
+There are two ways to provide this application with info about notifications 
+via accesiblities or via notification access. 
+The later one is the prefered method which is only support on Android 4.3 and up.
+To enable Botifier via Notification Access (Android 4.3 only):
+Goto Settings -> Security -> Notification Access -> Enable Botifier (Setting only available if Botifier is installed)
+To enable Botifier via Accessiblity:
+Goto Settings -> Accessiblity -> Enable Botifier
+Do not enable both methods which will cause unexpected behaviour.
+.
+
+Repo Type:git
+Repo:https://github.com/grimpy/Botifier.git
+
+Build:1.3.2,14
+    commit=1.3.2
+    prebuild=sed -i '/key/d' project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3.2
+Current Version Code:14
+
diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt
index 1b74280f8b..65dd645c76 100644
--- a/metadata/com.github.mobile.txt
+++ b/metadata/com.github.mobile.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:https://github.com/github/android
 Source Code:https://github.com/github/android
@@ -23,18 +23,60 @@ Anti-feature:Network Services. GitHub.com itself runs primarily proprietary code
 Repo Type:git
 Repo:https://github.com/github/android.git
 
-Build Version:1.1,600,1.1,maven=yes,bindir=app/target
-Build Version:1.2,700,1.2,maven=yes,bindir=app/target
-Build Version:1.3.1,900,1.3.1,maven=yes,bindir=app/target
-Build Version:1.4,1000,1.4,maven=yes,bindir=app/target
-Build Version:1.5,1100,1.5,maven=yes,bindir=app/target
-Build Version:1.6.1,1300,1.6.1,maven=yes,bindir=app/target
-Build Version:1.7,1400,9e6a9f3d7daf,subdir=app,maven=yes,bindir=app/target
-Build Version:1.7.1,1500,1.7.1,subdir=app,maven=yes,bindir=app/target
-Build Version:1.7.3,1700,1.7.3,subdir=app,maven=yes
+Build:1.1,600
+    commit=1.1
+    maven=yes
+    bindir=app/target
+
+Build:1.2,700
+    commit=1.2
+    maven=yes
+    bindir=app/target
+
+Build:1.3.1,900
+    commit=1.3.1
+    maven=yes
+    bindir=app/target
+
+Build:1.4,1000
+    commit=1.4
+    maven=yes
+    bindir=app/target
+
+Build:1.5,1100
+    commit=1.5
+    maven=yes
+    bindir=app/target
+
+Build:1.6.1,1300
+    commit=1.6.1
+    maven=yes
+    bindir=app/target
+
+Build:1.7,1400
+    commit=9e6a9f3d7daf
+    subdir=app
+    maven=yes
+    bindir=app/target
+
+Build:1.7.1,1500
+    commit=1.7.1
+    subdir=app
+    maven=yes
+    bindir=app/target
+
+Build:1.7.3,1700
+    commit=1.7.3
+    subdir=app
+    maven=yes
+
+Build:1.8.0,1800
+    commit=1.8.0
+    subdir=app
+    maven=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.7.3
-Current Version Code:1700
+Current Version:1.8.0
+Current Version Code:1800
 
diff --git a/metadata/com.github.nicolassmith.urlevaluator.txt b/metadata/com.github.nicolassmith.urlevaluator.txt
new file mode 100644
index 0000000000..4c9d7e3e3a
--- /dev/null
+++ b/metadata/com.github.nicolassmith.urlevaluator.txt
@@ -0,0 +1,27 @@
+Categories:Internet
+License:MIT
+Web Site:
+Source Code:https://github.com/nicolassmith/urlevaluator
+Issue Tracker:https://github.com/nicolassmith/urlevaluator/issues
+
+Auto Name:Short URL Evaluator
+Summary:Evaluate short urls
+Description:
+300 domains supported.
+.
+
+Repo Type:git
+Repo:https://github.com/nicolassmith/urlevaluator.git
+
+Build:1.8,9
+    commit=5cd3b
+    prebuild=echo -e 'java.source=1.6\njava.target=1.6' > ant.properties
+
+Build:2.2,12
+    commit=3dbfae62b69
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.2
+Current Version Code:12
+
diff --git a/metadata/com.github.nutomic.controldlna.txt b/metadata/com.github.nutomic.controldlna.txt
index dec2c5018b..bd36a9ab89 100644
--- a/metadata/com.github.nutomic.controldlna.txt
+++ b/metadata/com.github.nutomic.controldlna.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:NewBSD
 Web Site:
 Source Code:https://github.com/Nutomic/control-dlna
@@ -16,18 +16,29 @@ Status: Testing.
 Repo Type:git
 Repo:https://github.com/Nutomic/control-dlna.git
 
-Build Version:0.1.0,1,0972b7973,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.2.0,3,0.2.0,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.3.0,4,0.3.0,srclibs=ActionBarSherlock@4.4.0,\
-prebuild=\
-	sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:0.1.0,1
+    commit=0972b7973
+    srclibs=ActionBarSherlock@4.3.1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.2.0,3
+    commit=0.2.0
+    srclibs=ActionBarSherlock@4.3.1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.5.0,7
+    disable=no gradle
+    commit=0.5.0
+    gradle=yes
+
+Build:0.5.1,8
+    commit=0.5.1
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.3.0
-Current Version Code:4
+Current Version:0.5.1
+Current Version Code:8
 
diff --git a/metadata/com.github.ruleant.getback_gps.txt b/metadata/com.github.ruleant.getback_gps.txt
new file mode 100644
index 0000000000..68bb299a6f
--- /dev/null
+++ b/metadata/com.github.ruleant.getback_gps.txt
@@ -0,0 +1,46 @@
+Categories:Navigation
+License:GPLv3+
+Web Site:http://ruleant.github.io/getback_gps/
+Source Code:https://github.com/ruleant/getback_gps
+Issue Tracker:https://github.com/ruleant/getback_gps/issues
+
+Auto Name:GetBack GPS
+Summary:Navigation tool
+Description:
+Find your way back to a previously visited location using GPS coordinates.
+
+Features:
+* determine location based on GPS signal, WiFi or cell phone network:
+* use best/most accurate location provider
+* get location updates automatically (based on a time interval or change of location) or
+* get location on demand (by manually refreshing)
+* save a location
+* 'get back' mode: indicator pointing to a stored location (showing distance and direction)
+* indicate current speed and current bearing
+
+Available languages:
+* Czech
+* Dutch
+* English
+
+Is your language missing? You can [http://ruleant.github.io/getback_gps/#translation help translating].
+.
+
+Repo Type:git
+Repo:https://github.com/ruleant/getback_gps.git
+
+Build:0.1,11
+    commit=v0.1
+    maven=yes
+    prebuild=sed -i 's/3.8.0/3.6.1/g' pom.xml
+
+Build:0.1.1,12
+    commit=v0.1.1
+    maven=yes
+    prebuild=sed -i 's/3.8.0/3.6.1/g' pom.xml
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:0.1.1
+Current Version Code:12
+
diff --git a/metadata/com.github.wdkapps.fillup.txt b/metadata/com.github.wdkapps.fillup.txt
new file mode 100644
index 0000000000..909d58fe0e
--- /dev/null
+++ b/metadata/com.github.wdkapps.fillup.txt
@@ -0,0 +1,38 @@
+Category:Office
+License:Apachev2
+Web Site:http://wdkapps.github.io
+Source Code:https://github.com/wdkapps/FillUp
+Issue Tracker:https://github.com/wdkapps/FillUp/issues
+
+Auto Name:FillUp
+Summary:Calculate fuel mileage
+Description:
+When you buy fuel, just enter the amount you purchased and your current 
+odometer value; FillUp will calculate your mileage and maintain a log of your 
+fill-ups.
+
+*Manages data for one or more vehicles.
+*Calculates and plots average gas mileage.
+*Calculates and plots monthly totals for gas purchased and distance driven.
+*Stores all data on the device – doesn’t use your data plan.
+*Can import/export your data to CSV files on your sdcard.
+*Share the CSV files with other Apps for cloud backup!
+*Selectable units of measurement – can calculate:
+
+*miles per gallon (MPG)
+*kilometers per liter (KM/L)
+*liters per 100 kilometers (L/100KM)
+*miles per imperial gallon (UK MPG) – from miles and liters.
+*miles per imperial gallon (UK MPG) – from kilometers and liters.
+.
+
+Repo Type:git
+Repo:https://github.com/wdkapps/FillUp.git
+
+Build Version:1.5,13,530ac7d,target=android-10
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.5
+Current Version Code:13
+
diff --git a/metadata/com.glTron.txt b/metadata/com.glTron.txt
index 92c7b9953c..42a95de765 100644
--- a/metadata/com.glTron.txt
+++ b/metadata/com.glTron.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPL
 Web Site:https://github.com/Chluverman/android-gltron/
 Source Code:https://github.com/Chluverman/android-gltron
@@ -7,7 +7,8 @@ Issue Tracker:https://github.com/Chluverman/android-gltron/issues
 Auto Name:GL TRON
 Summary:3D lightbike racing game
 Description:
-Port of the open source glTRON, a 3D lightbike racing game.
+Port of glTRON, a 3D lightbike racing game.
+
 Relive the film as you try and cut off your opponents before they cut you off!!
 .
 
diff --git a/metadata/com.gladis.tictactoe.txt b/metadata/com.gladis.tictactoe.txt
index d66b1facf5..24d3c484a0 100644
--- a/metadata/com.gladis.tictactoe.txt
+++ b/metadata/com.gladis.tictactoe.txt
@@ -1,11 +1,11 @@
-Category:Games
+Categories:Games
 License:Beer License
 Web Site:
 Source Code:https://github.com/hwmrocker/tictactoe
 Issue Tracker:https://github.com/hwmrocker/tictactoe/issues
 
 Auto Name:TicTacToe
-Summary:Single player TicTacToe game.
+Summary:Single player TicTacToe game
 Description:
 A simple single player Tic Tac Toe game,
 played against the computer.
@@ -17,7 +17,7 @@ Repo:https://github.com/hwmrocker/tictactoe.git
 Build Version:1.0,1,9bda820598ce8f15dca3c06d76d5d6a5e73d9dc0
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:1
 
diff --git a/metadata/com.gluegadget.hndroid.txt b/metadata/com.gluegadget.hndroid.txt
index b19a46bd61..b0f4eb5a98 100644
--- a/metadata/com.gluegadget.hndroid.txt
+++ b/metadata/com.gluegadget.hndroid.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Unlicense
 Web Site:http://gluegadget.com/hndroid/
 Source Code:https://github.com/amir/HNdroid
diff --git a/metadata/com.gmail.altakey.effy.txt b/metadata/com.gmail.altakey.effy.txt
index 4464f3d7b5..d4398d6793 100644
--- a/metadata/com.gmail.altakey.effy.txt
+++ b/metadata/com.gmail.altakey.effy.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/taky/effy
 Source Code:https://github.com/taky/effy
diff --git a/metadata/com.gmail.charleszq.txt b/metadata/com.gmail.charleszq.txt
index a7f06b1bb2..be8ef57eb5 100644
--- a/metadata/com.gmail.charleszq.txt
+++ b/metadata/com.gmail.charleszq.txt
@@ -1,35 +1,25 @@
-#NonFreeDep can be removed with the Manifest patch below
 AntiFeatures:NonFreeDep
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:https://code.google.com/p/flickr-viewer-for-honeycomb/wiki/FeatureGuide
-Source Code:https://code.google.com/p/flickr-viewer-for-honeycomb/source/list
-Issue Tracker:https://code.google.com/p/flickr-viewer-for-honeycomb/issues/list
+Source Code:https://code.google.com/p/flickr-viewer-for-honeycomb/source
+Issue Tracker:https://code.google.com/p/flickr-viewer-for-honeycomb/issues
 
 Auto Name:Flickr Viewer HD
 Summary:Flickr viewer for tablets
 Description:
-N.B It isn't possible to view geo-tagged photos on a map because Google Maps is the only map source and
-f-droid can't supply an API key to use it.	
-
-Anti-feature: Dependencies. It's necessary for Google Maps to be already
-installed either as an app or as a shared system library for this app to be
-installable. We will be able to remove this dependency soon.
+N.B. It isn't possible to run this without properitary Google Maps installed.
 .
 
-#use git-svn if you want
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://flickr-viewer-for-honeycomb.googlecode.com/svn/trunk/
 
-#forced API 16 as I don't have API 13
-Build Version:1.2.8,19,402,target=Google Inc.:Google APIs:16
+Build:1.2.8,19
+    commit=402
+    target=Google Inc.:Google APIs:16
 
 Auto Update Mode:None
-#Attempting to view geotagged photos on the map if you don't have Google maps installed, will crash the app
-#Build Version:1.2.8,19,402,target=Google Inc.:Google APIs:16,prebuild=\
-#sed -i 's/android:required="true"/android:required="false"/g' AndroidManifest.xml
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.8
 Current Version Code:19
 
diff --git a/metadata/com.gokhanmoral.stweaks.app.txt b/metadata/com.gokhanmoral.stweaks.app.txt
index 100fbb7311..b834a953a2 100644
--- a/metadata/com.gokhanmoral.stweaks.app.txt
+++ b/metadata/com.gokhanmoral.stweaks.app.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://www.gokhanmoral.com
 Source Code:https://github.com/gokhanmoral/STweaks
diff --git a/metadata/com.googamaphone.typeandspeak.txt b/metadata/com.googamaphone.typeandspeak.txt
index b28faf344f..b7bdbfd39c 100644
--- a/metadata/com.googamaphone.typeandspeak.txt
+++ b/metadata/com.googamaphone.typeandspeak.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://code.google.com/p/typeandspeak
-Source Code:http://code.google.com/p/typeandspeak/source/list
-Issue Tracker:http://code.google.com/p/typeandspeak/issues/list
+Source Code:http://code.google.com/p/typeandspeak/source
+Issue Tracker:http://code.google.com/p/typeandspeak/issues
 
 Auto Name:Type and Speak
 Summary:Text to speech
@@ -20,8 +20,7 @@ Repo:https://code.google.com/p/typeandspeak/
 Build Version:1.4.8,36,44fe67acc70a,prebuild=mkdir -p typeandspeak-libs/src
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.8
 Current Version Code:36
 
diff --git a/metadata/com.google.android.apps.authenticator2.txt b/metadata/com.google.android.apps.authenticator2.txt
index 438b2d45a4..4c162b2e28 100644
--- a/metadata/com.google.android.apps.authenticator2.txt
+++ b/metadata/com.google.android.apps.authenticator2.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://code.google.com/p/google-authenticator/
-Source Code:https://code.google.com/p/google-authenticator/source/list?repo=android
-Issue Tracker:https://code.google.com/p/google-authenticator/issues/list
+Source Code:https://code.google.com/p/google-authenticator/source
+Issue Tracker:https://code.google.com/p/google-authenticator/issues
 
 Auto Name:Authenticator
 Summary:Two factor authentication
diff --git a/metadata/com.google.android.apps.iosched.txt b/metadata/com.google.android.apps.iosched.txt
index c4c04e4d34..867b44322f 100644
--- a/metadata/com.google.android.apps.iosched.txt
+++ b/metadata/com.google.android.apps.iosched.txt
@@ -1,8 +1,8 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://code.google.com/p/iosched/
-Source Code:http://code.google.com/p/iosched/source/checkout
-Issue Tracker:http://code.google.com/p/iosched/issues/list
+Source Code:http://code.google.com/p/iosched/source
+Issue Tracker:http://code.google.com/p/iosched/issues
 
 Auto Name:Google I/O 2012
 Summary:Google developer summit app
diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index 6323155338..5f30e44758 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -1,11 +1,11 @@
-Category:System
+Categories:System
 License:GPLv2+
 Web Site:http://diskusage.googlecode.com/
-Source Code:http://code.google.com/p/diskusage/source/checkout
-Issue Tracker:http://code.google.com/p/diskusage/issues/list
+Source Code:http://code.google.com/p/diskusage/source
+Issue Tracker:http://code.google.com/p/diskusage/issues
 
 Auto Name:DiskUsage
-Summary:Visual disk usage explorer
+Summary:Disk usage explorer
 Description:
 Visually explore used and free space on internal and external storage.
 .
@@ -13,17 +13,58 @@ Visually explore used and free space on internal and external storage.
 Repo Type:git
 Repo:https://code.google.com/p/diskusage/
 
-Build Version:2.0.4,2004,d3c0dc5bafdb,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:2.0.5,2005,cb8e91528207,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:2.1.3,2103,296d3317a49d,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.1,3010,f97462007110,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.2,3020,dfcba57e1d92,prebuild=mkdir libs && cp extra/system.jar libs/
-Build Version:3.2.1,3021,1ac11c9696b6,prebuild=mkdir libs && cp extra/system.jar libs/,buildjni=yes
-#AOSP jar: see http://code.google.com/p/diskusage/issues/detail?id=19
-Build Version:3.4,3040,bb21ead5dd0f,prebuild=mkdir libs && cp extra/system.jar libs/,buildjni=yes
+Build:2.0.4,2004
+    commit=d3c0dc5bafdb
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+
+Build:2.0.5,2005
+    commit=cb8e91528207
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+
+Build:2.1.3,2103
+    commit=296d3317a49d
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+
+Build:3.1,3010
+    commit=f97462007110
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+
+Build:3.2,3020
+    commit=dfcba57e1d92
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+
+Build:3.2.1,3021
+    commit=1ac11c9696b6
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+    buildjni=yes
+
+Build:3.4,3040
+    commit=bb21ead5dd0f
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+    buildjni=yes
+
+Build:3.4.2,3042
+    disable=needs assets/scan - maybe just move it after jni build?
+    commit=23bce9d7fc7b
+    rm=jni/scan;assets/scan
+    prebuild=mkdir libs && \
+        cp extra/system.jar libs/
+    buildjni=yes
+
+Maintainer Notes:
+The system.jar is from AOSP - see extra/system.jar.README and
+[http://code.google.com/p/diskusage/issues/detail?id=19]
+.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:3.4
-Current Version Code:3040
+Current Version:3.4.2
+Current Version Code:3042
 
diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt
index e7d06d23ad..8c352af1f4 100644
--- a/metadata/com.google.android.maps.mytracks.txt
+++ b/metadata/com.google.android.maps.mytracks.txt
@@ -1,12 +1,12 @@
 Disabled:Google Play Services non-free library etc.
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://code.google.com/p/mytracks/
-Source Code:http://code.google.com/p/mytracks/source/checkout
-Issue Tracker:http://code.google.com/p/mytracks/issues/list
+Source Code:http://code.google.com/p/mytracks/source
+Issue Tracker:http://code.google.com/p/mytracks/issues
 
-Summary:A GPS logger.
+Summary:A GPS logger
 Description:
 MyTracks is a GPS logger.
 .
diff --git a/metadata/com.google.android.marvin.talkback.txt b/metadata/com.google.android.marvin.talkback.txt
index 7782c71abc..8fef33bdee 100644
--- a/metadata/com.google.android.marvin.talkback.txt
+++ b/metadata/com.google.android.marvin.talkback.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/eyes-free
-Source Code:http://code.google.com/p/eyes-free/source/list
-Issue Tracker:http://code.google.com/p/eyes-free/issues/list
+Source Code:http://code.google.com/p/eyes-free/source
+Issue Tracker:http://code.google.com/p/eyes-free/issues
 
 Auto Name:TalkBack
 Summary:Accessibility improvements
diff --git a/metadata/com.google.android.stardroid.txt b/metadata/com.google.android.stardroid.txt
index bc735aa8c4..76f7aa2752 100644
--- a/metadata/com.google.android.stardroid.txt
+++ b/metadata/com.google.android.stardroid.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:https://code.google.com/p/stardroid/
-Source Code:https://code.google.com/p/stardroid/source/browse/
-Issue Tracker:https://code.google.com/p/stardroid/issues/list
+Source Code:https://code.google.com/p/stardroid/source
+Issue Tracker:https://code.google.com/p/stardroid/issues
 
 Auto Name:Sky Map
 Summary:Sky Map to explore the skies
@@ -16,14 +16,23 @@ service. It could be best to enter coordinates rather than entering a town or us
 The app has been built without the non-free Google Analytics library.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://stardroid.googlecode.com/svn/trunk/app
 
-Build Version:1.6.4,1112,3,prebuild=rm libs/libGoogleAnalytics.jar && rm libs/.svn/prop-base/libGoogleAnalytics.jar.svn-base && rm libs/.svn/text-base/libGoogleAnalytics.jar.svn-base,anal-tics=yes
+Build:1.6.4,1112
+    commit=3
+    prebuild=rm libs/libGoogleAnalytics.jar && \
+        rm libs/.svn/prop-base/libGoogleAnalytics.jar.svn-base && \
+        rm libs/.svn/text-base/libGoogleAnalytics.jar.svn-base
+    anal-tics=yes
+
+Build:1.6.5,1113
+    commit=8
+    rm=libs/libGoogleAnalytics.jar;libs/.svn/prop-base/libGoogleAnalytics.jar.svn-base;libs/.svn/text-base/libGoogleAnalytics.jar.svn-base
+    anal-tics=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.6.4
-Current Version Code:1112
+Update Check Mode:RepoManifest
+Current Version:1.6.5
+Current Version Code:1113
 
diff --git a/metadata/com.google.code.apps2org.txt b/metadata/com.google.code.apps2org.txt
new file mode 100644
index 0000000000..11a97a28bd
--- /dev/null
+++ b/metadata/com.google.code.apps2org.txt
@@ -0,0 +1,30 @@
+Categories:System
+License:GPLv3+
+Web Site:https://github.com/pfalcon/apps2org
+Source Code:https://github.com/pfalcon/apps2org
+Issue Tracker:https://github.com/pfalcon/apps2org/issues
+
+Auto Name:Apps2Org
+Summary:Organize apps with labels
+Description:
+Apps2Org is a fork of [[com.google.code.appsorganizer]] which fixes
+some usability issues. Apps2Org allows you to organize installed
+applications using labels/tags/categories. You can associate labels to
+applications, browse thru labeled categories and launch applications -
+either using the application or shortcut on your home screen.
+
+Comparing to original application, following changes were made:
+* "All labels" shortcut now includes "Other" (uncategorized) apps, so this shortcut completely replaces app launcher and gives access to all of your apps.
+* You can easily star/set label for an app directly from shortcut widget, so you can keep your app collection organized "right on the spot" with very little effort.
+* Other minor fixes and improvements.
+.
+
+Repo Type:git
+Repo:https://github.com/pfalcon/apps2org
+
+Build Version:1.6.0,200,v1.6.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.6.0
+Current Version Code:200
diff --git a/metadata/com.google.code.appsorganizer.txt b/metadata/com.google.code.appsorganizer.txt
index 0778b05541..226d811690 100644
--- a/metadata/com.google.code.appsorganizer.txt
+++ b/metadata/com.google.code.appsorganizer.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://sites.google.com/site/appsorganizer/
-Source Code:http://code.google.com/p/appsorganizer/source/checkout
-Issue Tracker:http://code.google.com/p/appsorganizer/issues/list
+Source Code:http://code.google.com/p/appsorganizer/source
+Issue Tracker:http://code.google.com/p/appsorganizer/issues
 Donate:http://sites.google.com/site/appsorganizer/donate
 
 Auto Name:Apps Organizer
@@ -13,18 +13,17 @@ labels. You can associate labels to applications, uninstall
 applications and create "label shortcuts" on the home screen.
 .
 
-Repo Type:svn
-Repo:http://appsorganizer.googlecode.com/svn/trunk
+Repo Type:git-svn
+Repo:http://appsorganizer.googlecode.com/svn/trunk/AppsOrganizer
 
-Build Version:1.5.14,162,184,subdir=AppsOrganizer
-Build Version:1.5.15,163,185,subdir=AppsOrganizer
-Build Version:1.5.16,164,187,subdir=AppsOrganizer
-Build Version:1.5.18,166,190,subdir=AppsOrganizer
-Build Version:1.5.19,167,191,subdir=AppsOrganizer,target=android-10
+Build Version:1.5.14,162,184
+Build Version:1.5.15,163,185
+Build Version:1.5.16,164,187
+Build Version:1.5.18,166,190
+Build Version:1.5.19,167,191,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5.19
 Current Version Code:167
 
diff --git a/metadata/com.google.code.geobeagle.txt b/metadata/com.google.code.geobeagle.txt
index ef4b773fd7..832d3b8199 100644
--- a/metadata/com.google.code.geobeagle.txt
+++ b/metadata/com.google.code.geobeagle.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://code.google.com/p/geobeagle/
-Source Code:http://code.google.com/p/geobeagle/source/list
-Issue Tracker:http://code.google.com/p/geobeagle/issues/list
+Source Code:http://code.google.com/p/geobeagle/source
+Issue Tracker:http://code.google.com/p/geobeagle/issues
 
 Auto Name:GeoBeagle
 Summary:Search for geocaches/letterboxes
diff --git a/metadata/com.google.marvin.shell.txt b/metadata/com.google.marvin.shell.txt
index 919336bb4b..0340ed5f3e 100644
--- a/metadata/com.google.marvin.shell.txt
+++ b/metadata/com.google.marvin.shell.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/eyes-free
-Source Code:http://code.google.com/p/eyes-free/source/list
-Issue Tracker:http://code.google.com/p/eyes-free/issues/list
+Source Code:http://code.google.com/p/eyes-free/source
+Issue Tracker:http://code.google.com/p/eyes-free/issues
 
 Auto Name:%s
 Summary:Alternative homescreen
diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt
index cc0517d943..f6fdebe31d 100644
--- a/metadata/com.google.zxing.client.android.txt
+++ b/metadata/com.google.zxing.client.android.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://code.google.com/p/zxing/wiki
-Source Code:http://code.google.com/p/zxing/source/list
-Issue Tracker:http://code.google.com/p/zxing/issues/list
+Source Code:http://code.google.com/p/zxing/source
+Issue Tracker:http://code.google.com/p/zxing/issues
 
 Auto Name:Barcode Scanner
 Summary:Barcode scanner
@@ -36,18 +36,37 @@ See the website for troubleshooting and explanations of the permissions.
 Repo Type:git-svn
 Repo:http://zxing.googlecode.com/svn/trunk
 
-Build Version:4.3.1,87,2433,subdir=android,prebuild=cd ../core && ant build export && cd ../android
-Build Version:4.4,91,2831,subdir=android,prebuild=\
-sed -i '477s/shopperMarketListener/null/g;s/R.string.msg_install_google_shopper/\
-"Google Shopper is non-free software"/g' \
-src/com/google/zxing/client/android/result/ResultHandler.java,\
-build=$$MVN3$$ package -f ../core/pom.xml
-Build Version:4.5,93,2880,subdir=android,build=$$MVN3$$ package -f ../core/pom.xml
-Build Version:4.5.1,94,2883,subdir=android,build=$$MVN3$$ package -f ../core/pom.xml
+Build:4.3.1,87
+    commit=2433
+    subdir=android
+    prebuild=cd ../core && \
+        ant build export && \
+        cd ../android
+
+Build:4.4,91
+    commit=2831
+    subdir=android
+    prebuild=sed -i '477s/shopperMarketListener/null/g;s/R.string.msg_install_google_shopper/"Google Shopper is non-free software"/g' src/com/google/zxing/client/android/result/ResultHandler.java
+    build=$$MVN3$$ package -f ../core/pom.xml
+
+Build:4.5,93
+    commit=2880
+    subdir=android
+    build=$$MVN3$$ package -f ../core/pom.xml
+
+Build:4.5.1,94
+    commit=2883
+    subdir=android
+    build=$$MVN3$$ package -f ../core/pom.xml
+
+Build:4.5.2,95
+    commit=2982
+    subdir=android
+    build=$$MVN3$$ package -f ../core/pom.xml
 
 Auto Update Mode:None
 # see downloads page or gplay; tags are not used
 Update Check Mode:RepoManifest
-Current Version:4.5.1
-Current Version Code:94
+Current Version:4.5.2
+Current Version Code:95
 
diff --git a/metadata/com.googlecode.android.wifi.tether.txt b/metadata/com.googlecode.android.wifi.tether.txt
index 3c363af7cc..9b3d9f3aa4 100644
--- a/metadata/com.googlecode.android.wifi.tether.txt
+++ b/metadata/com.googlecode.android.wifi.tether.txt
@@ -1,9 +1,9 @@
 Disabled:Prebuilts
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/android-wifi-tether/
-Source Code:https://code.google.com/p/android-wifi-tether/source/list
-Issue Tracker:https://code.google.com/p/android-wifi-tether/issues/list
+Source Code:https://code.google.com/p/android-wifi-tether/source
+Issue Tracker:https://code.google.com/p/android-wifi-tether/issues
 Donate:https://code.google.com/p/android-wifi-tether/
 
 Auto Name:WiFi Tether
@@ -28,7 +28,7 @@ website for detailed information.
 
 Requires Root:Yes
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 
 Build Version:3.2-beta2,38,548,buildjni=yes,forceversion=yes
diff --git a/metadata/com.googlecode.android_scripting.txt b/metadata/com.googlecode.android_scripting.txt
index c8fd9e01b3..74ff934cba 100644
--- a/metadata/com.googlecode.android_scripting.txt
+++ b/metadata/com.googlecode.android_scripting.txt
@@ -1,8 +1,9 @@
-Category:Development
+AntiFeatures:UpstreamNonFree
+Categories:Development
 License:Apache2
 Web Site:http://code.google.com/p/android-scripting
-Source Code:http://code.google.com/p/android-scripting/source/browse
-Issue Tracker:http://code.google.com/p/android-scripting/issues/list
+Source Code:http://code.google.com/p/android-scripting/source
+Issue Tracker:http://code.google.com/p/android-scripting/issues
 
 Auto Name:SL4A
 Summary:Script interpreter
@@ -19,15 +20,16 @@ SL4A is designed for developers and is alpha quality software.
 Repo Type:git
 Repo:https://github.com/damonkohler/sl4a.git
 
-Build Version:6x03,603,!Prebuilt binaries at dcfa832f80,subdir=android/ScriptingLayerForAndroid,\
-update=.;../QuickAction,\
-rm=android/Common/libs/libGoogleAnalytics.jar;android/ScriptForAndroidTemplate/libs/libGoogleAnalytics.jar,\
-scanignore=android/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java,\
-srclibs=NoAnalytics@158a4a,prebuild=\
-echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
-echo "source.dir=src;../Common/src;../BluetoothFacade/src;\
-../InterpreterForAndroid/src;../SignalStrengthFacade/src;../TextToSpeechFacade/src;\
-../Utils/src;../WebCamFacade/src" > ant.properties,buildjni=yes
+Build:6x03,603
+    disable=wip - srclib location issue
+    commit=dcfa832f80
+    subdir=android/ScriptingLayerForAndroid
+    update=.;../QuickAction
+    rm=android/ScriptForAndroidTemplate;android/PythonForAndroid;android/Common/libs/libGoogleAnalytics.jar;android/ScriptForAndroidTemplate/libs/libGoogleAnalytics.jar;lua;python;python-build;python-modules;rhino;beanshell;perl
+    srclibs=NoAnalytics@158a4a
+    prebuild=echo "source.dir=src;../Common/src;../BluetoothFacade/src;../InterpreterForAndroid/src;../SignalStrengthFacade/src;../TextToSpeechFacade/src;../Utils/src;../WebCamFacade/src;$$NoAnalytics$$" > ant.properties
+    scanignore=android/Utils/src/com/googlecode/android_scripting/interpreter/ExternalClassLoader.java
+    buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.googlecode.awsms.txt b/metadata/com.googlecode.awsms.txt
index 50945665e7..2705b1f4b1 100644
--- a/metadata/com.googlecode.awsms.txt
+++ b/metadata/com.googlecode.awsms.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://ermetesms.it
-Source Code:http://code.google.com/p/esms/source/list
-Issue Tracker:http://code.google.com/p/esms/issues/list
+Source Code:http://code.google.com/p/esms/source
+Issue Tracker:http://code.google.com/p/esms/issues
 
 Auto Name:Ermete SMS
 Summary:Send SMS via the web
@@ -21,8 +21,7 @@ Build Version:2.0.5,25,64,subdir=android,extlibs=jdom/jdom-1.1.3.jar,prebuild=\
 echo "source.dir=src;../core/src" >> project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.5
 Current Version Code:25
 
diff --git a/metadata/com.googlecode.chartdroid.txt b/metadata/com.googlecode.chartdroid.txt
index 45da0d6d5c..73205886fe 100644
--- a/metadata/com.googlecode.chartdroid.txt
+++ b/metadata/com.googlecode.chartdroid.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://code.google.com/p/chartdroid/
-Source Code:http://code.google.com/p/chartdroid/source/checkout
-Issue Tracker:http://code.google.com/p/chartdroid/issues/list
+Source Code:http://code.google.com/p/chartdroid/source
+Issue Tracker:http://code.google.com/p/chartdroid/issues
 
 Auto Name:ChartDroid Core
 Summary:Chart engine
@@ -12,14 +12,13 @@ You don't need to install this unless another app needs it. ChartDroid is an Int
 graph/plot/display numerical data in many representations by implementing a ContentProvider.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://chartdroid.googlecode.com/svn/trunk/core
 
 Build Version:2.0.0,18,294
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.0
 Current Version Code:18
 
diff --git a/metadata/com.googlecode.droidwall.txt b/metadata/com.googlecode.droidwall.txt
index 0ee1c23939..3f68c06586 100644
--- a/metadata/com.googlecode.droidwall.txt
+++ b/metadata/com.googlecode.droidwall.txt
@@ -1,13 +1,13 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/droidwall/
 Source Code:http://droidwall.googlecode.com/svn/tags/v1.5.7
-Issue Tracker:http://code.google.com/p/droidwall/issues/list
+Issue Tracker:http://code.google.com/p/droidwall/issues
 
 Auto Name:DroidWall
 Summary:Firewall frontend
 Description:
-'''N.B'''Development of this app has ceased.
+'''N.B'''Development of this app ceased in mid 2012.
 
 Tap the tab at the top to switch between whitelist and blacklist mode.
 Tap Menu and Apply Changes to apply.
@@ -20,26 +20,30 @@ Requires root: Yes. iptables (the firewall itself) has to be run as root.
 Requires Root:Yes
 
 #The trunk is now (08-2012) empty but svn/tags/ is still populated
-Repo Type:svn
-Repo:http://droidwall.googlecode.com/svn/tags/v1.5.7
+Repo Type:git-svn
+Repo:http://droidwall.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:1.5.7,157,250,target=android-8,init=\
-rm -rf external/iptables && cd external && \
-git clone https://android.googlesource.com/platform/external/iptables,\
-patch=iptables.patch,srclibs=Busybox@83785f0;BusyboxConfigs@bd2bf4f3,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox && \
-sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\" \
-android:maxSdkVersion=\"10\"/g' AndroidManifest.xml && \
-cp $$BusyboxConfigs$$/android_ndk_defconfigPlus $$Busybox$$/.config,build=\
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" -C $$Busybox$$ && \
-mv $$Busybox$$/busybox res/raw/busybox_g1 && \
-cd external/iptables && python extensions/fixinit.py && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../../res/raw/iptables_armv5
+Build:1.5.7,157
+    commit=250
+    init=rm -rf external/iptables && \
+        cd external && \
+        git clone https://android.googlesource.com/platform/external/iptables
+    target=android-8
+    srclibs=Busybox@83785f0;BusyboxConfigs@bd2bf4f3
+    patch=iptables.patch
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox && \
+        sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\" android:maxSdkVersion=\"10\"/g' AndroidManifest.xml && \
+        cp $$BusyboxConfigs$$/android_ndk_defconfigPlus $$Busybox$$/.config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" -C $$Busybox$$ && \
+        mv $$Busybox$$/busybox res/raw/busybox_g1 && \
+        cd external/iptables && \
+        python extensions/fixinit.py && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../../res/raw/iptables_armv5
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:Tags
 Current Version:1.5.7
 Current Version Code:157
 
diff --git a/metadata/com.googlecode.eyesfree.espeak.txt b/metadata/com.googlecode.eyesfree.espeak.txt
new file mode 100644
index 0000000000..42da53e344
--- /dev/null
+++ b/metadata/com.googlecode.eyesfree.espeak.txt
@@ -0,0 +1,40 @@
+Categories:Multimedia
+License:Apache2
+Web Site:https://code.google.com/p/eyes-free/
+Source Code:https://code.google.com/p/eyes-free/source
+Issue Tracker:https://code.google.com/p/eyes-free/issues
+
+Summary:Text-to-Speech Engine
+Description:
+Alternative Text-to-Speech Engine with support for more languages.
+.
+
+Repo Type:git-svn
+Repo:http://eyes-free.googlecode.com/svn/trunk/tts/espeak-tts
+
+Build:1.46.02_r7,7
+    commit=771
+    scanignore=jni/ttsespeak/espeak-source
+    prebuild=cd jni/ttsespeak && \
+            wget http://surfnet.dl.sourceforge.net/project/espeak/espeak/espeak-1.46/espeak-1.46.02-source.zip && \
+            unzip espeak-1.46.02-source.zip && \
+            rm -f espeak-1.46.02-source.zip && \
+            rm -rf espeak-source && \
+            mv espeak-1.46.02-source espeak-source && \
+            cd ../../res && \
+            mkdir -p raw && \
+            cd ../jni/ttsespeak/espeak-source && \
+            zip -r -9 espeakdata.zip espeak-data && \
+            mv espeakdata.zip ../../../res/raw
+    buildjni=yes
+
+Maintainer Notes:
+might require libespeak-dev to build
+binary files in libs/ are deleted before build and then rebuild
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.46.02_r7
+Current Version Code:7
+
diff --git a/metadata/com.googlecode.gogodroid.txt b/metadata/com.googlecode.gogodroid.txt
new file mode 100644
index 0000000000..2005a13e9a
--- /dev/null
+++ b/metadata/com.googlecode.gogodroid.txt
@@ -0,0 +1,34 @@
+Categories:System
+License:GPLv2
+Web Site:https://code.google.com/p/gogodroid/
+Source Code:https://code.google.com/p/gogodroid/source
+Issue Tracker:https://code.google.com/p/gogodroid/issues
+
+Summary:Graphical frontend of gogoc for Android
+Description:
+TSP is a control protocol used to establish and maintain static tunnels.
+The Gateway6 client (gogoc) is used on the host computer to connect to a
+tunnel broker using the TSP protocol and to get the information for its
+tunnel. When it receives the information for the tunnel, the Gateway6
+client creates the static tunnel on its operating system.
+GogoDroid is a graphical frontend of gogoc for Android.
+.
+
+Requires Root:Yes
+
+Repo Type:git-svn
+Repo:http://gogodroid.googlecode.com/svn/trunk/gogodroid
+
+Build:1.3,13
+    commit=40
+    init=rm res/raw/gogoc
+    patch=remove_dup_defn.patch;sformat.patch
+    build=cd gogoc-android && \
+        $$NDK$$/ndk-build && \
+        cp libs/armeabi/gogoc ../res/raw
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:13
+
diff --git a/metadata/com.googlecode.gogodroid/remove_dup_defn.patch b/metadata/com.googlecode.gogodroid/remove_dup_defn.patch
new file mode 100644
index 0000000000..51fe02d6f7
--- /dev/null
+++ b/metadata/com.googlecode.gogodroid/remove_dup_defn.patch
@@ -0,0 +1,17 @@
+Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c
+===================================================================
+--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c	(revision 40)
++++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_setup.c	(working copy)
+@@ -45,12 +45,6 @@
+ #include <linux/if.h>
+ #include <linux/route.h>
+ 
+-struct in6_ifreq {
+-  struct in6_addr ifr6_addr;
+-  __u32           ifr6_prefixlen;
+-  int             ifr6_ifindex; 
+-};
+-
+ struct in6_rtmsg {
+   struct in6_addr rtmsg_dst;
+   struct in6_addr rtmsg_src;
diff --git a/metadata/com.googlecode.gogodroid/sformat.patch b/metadata/com.googlecode.gogodroid/sformat.patch
new file mode 100644
index 0000000000..cc7f8c316c
--- /dev/null
+++ b/metadata/com.googlecode.gogodroid/sformat.patch
@@ -0,0 +1,35 @@
+Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c
+===================================================================
+--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c	(revision 40)
++++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/lib/cli.c	(working copy)
+@@ -29,7 +29,7 @@
+   // Print the message, if a message was passed.
+   if( message )
+   {
+-    printf(message);
++    printf("%s", message);
+   }
+ 
+   // Print the usage.
+Index: gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c
+===================================================================
+--- a/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c	(revision 40)
++++ b/gogoc-android/native/gogoc-1_2-RELEASE/gogoc-tsp/src/tsp/tsp_redirect.c	(working copy)
+@@ -60,7 +60,7 @@
+ 	}
+ 
+ 	/* Set the broker address */
+-	pal_snprintf(new_broker->address, MAX_REDIRECT_ADDRESS_LENGTH, address);
++	pal_snprintf(new_broker->address, MAX_REDIRECT_ADDRESS_LENGTH, "%s", address);
+ 
+ 	/* Validate that the address was set correctly */
+ 	if (strlen(new_broker->address) != strlen(address)) {
+@@ -433,7 +433,7 @@
+ 		if (strlen(line) && (line[strlen(line) - 1] == '\n' || line[strlen(line) - 1] == '\r')) line[strlen(line) - 1] = '\0';
+ 
+ 		/* Copy the line to the buffer */
+-		sprintf(buffer, line);
++		sprintf(buffer, "%s", line);
+ 
+ 		/* We found a server, so stop looking */
+ 		found_server = 1;
diff --git a/metadata/com.googlecode.gtalksms.txt b/metadata/com.googlecode.gtalksms.txt
index 916005c099..894c98314e 100644
--- a/metadata/com.googlecode.gtalksms.txt
+++ b/metadata/com.googlecode.gtalksms.txt
@@ -1,8 +1,9 @@
-Category:Phone & SMS
+AntiFeatures:UpstreamNonFree
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/gtalksms/w/list
-Source Code:https://code.google.com/p/gtalksms/source/list
-Issue Tracker:https://code.google.com/p/gtalksms/issues/list
+Source Code:https://code.google.com/p/gtalksms/source
+Issue Tracker:https://code.google.com/p/gtalksms/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=WQDV6S67WAC7A&lc=US&item_name=GTalkSMS&item_number=WEB&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
 FlattrID:130193
 
@@ -23,17 +24,31 @@ proprietary software.
 Repo Type:git
 Repo:https://code.google.com/p/gtalksms/
 
-Build Version:4.2,64,4.2,\
-update=.;external-libs/ActionBarSherlock-4.1.0.0,srclibs=MobAdMob@2d5736,prebuild=\
-rm -rf test/ libs-sources/ libs/GoogleAdMobAdsSdk-6.0.1.jar libs/libGoogleAnalytics.jar && \
-echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
-Build Version:4.3,66,4.3,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:4.4.1,69,4.4.1,submodules=yes,update=.;external-libs/ActionBarSherlock/library
-Build Version:4.4.2,70,!Proprietary binaries (at 4.4.2),submodules=yes,update=.;external-libs/ActionBarSherlock/library
+Build:4.2,64
+    commit=4.2
+    update=.;external-libs/ActionBarSherlock-4.1.0.0
+    srclibs=MobAdMob@2d5736
+    prebuild=rm -rf test/ libs-sources/ libs/GoogleAdMobAdsSdk-6.0.1.jar libs/libGoogleAnalytics.jar && \
+        echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
+
+Build:4.3,66
+    commit=4.3
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:4.4.1,69
+    commit=4.4.1
+    submodules=yes
+    update=.;external-libs/ActionBarSherlock/library
+
+Build:4.4.2,70
+    disable=!Proprietary binaries (at 4.4.2)
+    commit=4.4.2
+    submodules=yes
+    update=.;external-libs/ActionBarSherlock/library
 
 Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:4.4.2
-Current Version Code:70
+Update Check Mode:Static
+Current Version:4.4.1
+Current Version Code:69
 
diff --git a/metadata/com.googlecode.networklog.txt b/metadata/com.googlecode.networklog.txt
index 441a3f0881..685342295e 100644
--- a/metadata/com.googlecode.networklog.txt
+++ b/metadata/com.googlecode.networklog.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:MPL2
 Web Site:https://code.google.com/p/iptableslog/
-Source Code:https://code.google.com/p/iptableslog/source/list
-Issue Tracker:https://code.google.com/p/iptableslog/issues/list
+Source Code:https://code.google.com/p/iptableslog/source
+Issue Tracker:https://code.google.com/p/iptableslog/issues
 
 Auto Name:Network Log
 Summary:See what's accessing the internet
@@ -22,64 +22,156 @@ Requires Root:Yes
 Repo Type:git
 Repo:http://code.google.com/p/iptableslog/
 
-Build Version:2.5.1,20501,8aed25f3e6e1,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.7.2,20702,373324be8c18,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.8.0,20800,2.8.0,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.8.1,20801,2.8.1,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.8.2,20802,2.8.2,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.8.3,20803,2.8.3,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.8.4,20804,2.8.4,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.10.0,21000,2.10.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
-Build Version:2.11.0,21100,2.11.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.12.0,21200,2.12.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
-Build Version:2.12.1,21201,2.12.1,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.13.0,21300,2.13.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
-Build Version:2.14.0,21400,2.14.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.15.0,21500,2.15.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
-Build Version:2.16.0,21600,2.16.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.17.0,21700,2.17.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar
+Build:2.5.1,20501
+    commit=8aed25f3e6e1
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.7.2,20702
+    commit=373324be8c18
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.8.0,20800
+    commit=2.8.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.8.1,20801
+    commit=2.8.1
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.8.2,20802
+    commit=2.8.2
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.8.3,20803
+    commit=2.8.3
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.8.4,20804
+    commit=2.8.4
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+
+Build:2.10.0,21000
+    commit=2.10.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.11.0,21100
+    commit=2.11.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.12.0,21200
+    commit=2.12.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.12.1,21201
+    commit=2.12.1
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.13.0,21300
+    commit=2.13.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.14.0,21400
+    commit=2.14.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.15.0,21500
+    commit=2.15.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.16.0,21600
+    commit=2.16.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.17.0,21700
+    commit=2.17.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
 # Using alternative iptables source still leads to fdroid errors for non-armeabi
-Build Version:2.17.1,21701,!2.17.0,\
-update=.;ActionBarSherlock/library;ViewPagerIndicator/library,\
-target=android-15,\
-prebuild=rm libs/android*.jar && cd jni/ && rm -rf iptables && \
-         wget https://hg.adblockplus.org/adblockplusandroid/raw-file/d7c96f2212b1/iptables.patch && \
-         git clone https://android.googlesource.com/platform/external/iptables && \
-         cd iptables && git apply ../iptables.patch && \
-         make fixextensions,\
-build=$$NDK$$/ndk-build && \
-      mv libs/armeabi/grep libs/armeabi/grep_armv5 && \
-      zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \
-      mv libs/armeabi/nflog libs/armeabi/nflog_armv5 && \
-      zip res/raw/nflog_armv5.zip libs/armeabi/nflog_armv5 && \
-      mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \
-      zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \
-      mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \
-      zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \
-      mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \
-      zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \
-      mv libs/armeabi-v7a/nflog libs/armeabi-v7a/nflog_armv7 && \
-      zip res/raw/nflog_armv7.zip libs/armeabi/nflog_armv7 && \
-      mv libs/mips/grep libs/mips/grep_mips && \
-      zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \
-      mv libs/mips/iptables libs/mips/iptables_mips && \
-      zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \
-      mv libs/mips/nflog libs/mips/nflog_mips && \
-      zip res/raw/nflog_mips.zip libs/armeabi/nflog_mips && \
-      mv libs/x86/grep libs/x86/grep_x86 && \
-      zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \
-      mv libs/x86/iptables libs/x86/iptables_x86 && \
-      zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \
-      mv libs/x86/nflog libs/x86/nflog_x86 && \
-      zip res/raw/nflog_x86.zip libs/armeabi/nflog_x86 && \
-      rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86,\
-buildjni=no
-Build Version:2.18.0,21800,2.18.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library
-Build Version:2.20.0,22000,2.20.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library;FileSelector
-Build Version:2.20.1,22001,2.20.1,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library;FileSelector
+Build:2.17.1,21701
+    disable=2.17.0
+    commit=unknown - see disabled
+    target=android-15
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    prebuild=rm libs/android*.jar && \
+        cd jni/ && \
+        rm -rf iptables && \
+        wget https://hg.adblockplus.org/adblockplusandroid/raw-file/d7c96f2212b1/iptables.patch && \
+        git clone https://android.googlesource.com/platform/external/iptables && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        make fixextensions
+    build=$$NDK$$/ndk-build && \
+        mv libs/armeabi/grep libs/armeabi/grep_armv5 && \
+        zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \
+        mv libs/armeabi/nflog libs/armeabi/nflog_armv5 && \
+        zip res/raw/nflog_armv5.zip libs/armeabi/nflog_armv5 && \
+        mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \
+        zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \
+        mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \
+        zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \
+        mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \
+        zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \
+        mv libs/armeabi-v7a/nflog libs/armeabi-v7a/nflog_armv7 && \
+        zip res/raw/nflog_armv7.zip libs/armeabi/nflog_armv7 && \
+        mv libs/mips/grep libs/mips/grep_mips && \
+        zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \
+        mv libs/mips/iptables libs/mips/iptables_mips && \
+        zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \
+        mv libs/mips/nflog libs/mips/nflog_mips && \
+        zip res/raw/nflog_mips.zip libs/armeabi/nflog_mips && \
+        mv libs/x86/grep libs/x86/grep_x86 && \
+        zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \
+        mv libs/x86/iptables libs/x86/iptables_x86 && \
+        zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \
+        mv libs/x86/nflog libs/x86/nflog_x86 && \
+        zip res/raw/nflog_x86.zip libs/armeabi/nflog_x86 && \
+        rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86
+    buildjni=no
+
+Build:2.18.0,21800
+    commit=2.18.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.20.0,22000
+    commit=2.20.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library;FileSelector
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.20.1,22001
+    commit=2.20.1
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library;FileSelector
+    rm=libs/android-support-v4.jar
+    buildjni=no
+
+Build:2.21.0,22100
+    commit=2.21.0
+    update=.;ActionBarSherlock/library;ViewPagerIndicator/library;FileSelector
+    rm=libs/android-support-v4.jar
+    buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.20.1
-Current Version Code:22001
+Current Version:2.21.0
+Current Version Code:22100
 
diff --git a/metadata/com.googlecode.openwnn.legacy.txt b/metadata/com.googlecode.openwnn.legacy.txt
index 5f32a5641d..2dfe725278 100644
--- a/metadata/com.googlecode.openwnn.legacy.txt
+++ b/metadata/com.googlecode.openwnn.legacy.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/openwnn-legacy
-Source Code:http://code.google.com/p/openwnn-legacy/source/browse
-Issue Tracker:http://code.google.com/p/openwnn-legacy/issues/list
+Source Code:http://code.google.com/p/openwnn-legacy/source
+Issue Tracker:http://code.google.com/p/openwnn-legacy/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mariotaku.lee%40gmail%2ecom&item_name=Donate%20to%20OpenWnn
 
 Name:OpenWnn Legacy
diff --git a/metadata/com.googlecode.talkmyphone.txt b/metadata/com.googlecode.talkmyphone.txt
index 9fad5a81ae..7e9ec0db41 100644
--- a/metadata/com.googlecode.talkmyphone.txt
+++ b/metadata/com.googlecode.talkmyphone.txt
@@ -2,8 +2,8 @@ Disabled:Superseded by com.googlecode.gtalksms
 Category:System
 License:LGPL
 Web Site:http://code.google.com/p/talkmyphone/
-Source Code:http://code.google.com/p/talkmyphone/source/checkout
-Issue Tracker:http://code.google.com/p/talkmyphone/issues/list
+Source Code:http://code.google.com/p/talkmyphone/source
+Issue Tracker:http://code.google.com/p/talkmyphone/issues
 
 Summary:Remote control of phone by XMPP
 Description:
diff --git a/metadata/com.googlecode.tcime.txt b/metadata/com.googlecode.tcime.txt
index 7f0c68eb26..bbfda392b2 100644
--- a/metadata/com.googlecode.tcime.txt
+++ b/metadata/com.googlecode.tcime.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/android-traditional-chinese-ime
-Source Code:http://code.google.com/p/android-traditional-chinese-ime/source/browse
-Issue Tracker:http://code.google.com/p/android-traditional-chinese-ime/issues/list
+Source Code:http://code.google.com/p/android-traditional-chinese-ime/source
+Issue Tracker:http://code.google.com/p/android-traditional-chinese-ime/issues
 
 Auto Name:注音倉頡輸入法
 Summary:Keyboard for zh_TW
diff --git a/metadata/com.gpl.rpg.AndorsTrail.txt b/metadata/com.gpl.rpg.AndorsTrail.txt
index 9f276848be..783e51c633 100644
--- a/metadata/com.gpl.rpg.AndorsTrail.txt
+++ b/metadata/com.gpl.rpg.AndorsTrail.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2
-Web Site:http://andors.techby2guys.com/
-Source Code:http://code.google.com/p/andors-trail/
-Issue Tracker:http://code.google.com/p/andors-trail/issues/list
+Web Site:http://andors.techby2guys.com
+Source Code:http://code.google.com/p/andors-trail/source
+Issue Tracker:http://code.google.com/p/andors-trail/issues
 
 Auto Name:Andor's Trail
 Summary:Quest-driven RPG
diff --git a/metadata/com.gpstether.txt b/metadata/com.gpstether.txt
index 27cc813b01..4787b81a3c 100644
--- a/metadata/com.gpstether.txt
+++ b/metadata/com.gpstether.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/gpstether/
-Source Code:http://code.google.com/p/gpstether/source/checkout
-Issue Tracker:http://code.google.com/p/gpstether/issues/list
+Source Code:http://code.google.com/p/gpstether/source
+Issue Tracker:http://code.google.com/p/gpstether/issues
 
 Auto Name:GPSTether
 Summary:GPS server
@@ -18,8 +18,7 @@ Build Version:1.0.2r9,3,!not being built by buildserver 6
 Build Version:1.0.3,3,!no source code
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.3
 Current Version Code:3
 
diff --git a/metadata/com.gracecode.android.presentation.txt b/metadata/com.gracecode.android.presentation.txt
new file mode 100644
index 0000000000..faa34966ae
--- /dev/null
+++ b/metadata/com.gracecode.android.presentation.txt
@@ -0,0 +1,32 @@
+Categories:Multimedia
+License:Apache2
+Web Site:
+Source Code:https://github.com/feelinglucky/Presentation
+Issue Tracker:https://github.com/feelinglucky/Presentation/issues
+Donate:http://t.cn/zRTdGks
+
+Auto Name:Presentation
+Summary:Gallery of infographics 
+Description:
+Some in English, mostly in Chinese; currently from huaban.com.
+.
+
+Repo Type:git
+Repo:https://github.com/feelinglucky/Presentation.git
+
+Build:1.0.2,20131114
+    commit=559f31d12f8e
+    target=android-16
+    srclibs=1:Volley@android-4.4_r1.2;2:PullToRefresh@v2.1.1
+    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties && \
+          find src -type f -print0 | xargs -0 sed -i '/TCAgent/d'
+
+Maintainer Notes:
+Next time: Should use tags and shouldn't use TCAgent patch
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.2
+Current Version Code:20131114
+
diff --git a/metadata/com.grapefruitopia.dashclock.k9.txt b/metadata/com.grapefruitopia.dashclock.k9.txt
index 0ee5ba2f61..a310221502 100644
--- a/metadata/com.grapefruitopia.dashclock.k9.txt
+++ b/metadata/com.grapefruitopia.dashclock.k9.txt
@@ -1,5 +1,5 @@
 Disabled:de.cketti.dashclock.k9 does the same, has more features and is more active
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/benjymous/dashclock-k-9
diff --git a/metadata/com.gs.mobileprint.txt b/metadata/com.gs.mobileprint.txt
index 91a8bd9e2d..0a2064c4b0 100644
--- a/metadata/com.gs.mobileprint.txt
+++ b/metadata/com.gs.mobileprint.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sourceforge.net/projects/mobileprint/
 # Empty
diff --git a/metadata/com.gueei.applocker.txt b/metadata/com.gueei.applocker.txt
index 26099a7484..f9dedbbda8 100644
--- a/metadata/com.gueei.applocker.txt
+++ b/metadata/com.gueei.applocker.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/applocker
-Source Code:http://code.google.com/p/applocker/source/checkout
-Issue Tracker:http://code.google.com/p/applocker/issues/list
+Source Code:http://code.google.com/p/applocker/source
+Issue Tracker:http://code.google.com/p/applocker/issues
 
 Auto Name:AppLocker
 Summary:Lockdown your apps
@@ -11,14 +11,14 @@ A simple mechanism for preventing certain apps from opening without a password
 .
 
 Repo Type:git-svn
-Repo:http://applocker.googlecode.com/svn/
+Repo:http://applocker.googlecode.com/svn/trunk/AppLocker
 
-#Source for library:http://code.google.com/p/android-binding/
-Build Version:1.2,3,5,subdir=trunk/AppLocker,prebuild=sed -i '/library/d' project.properties
+Build:1.2,3
+    commit=5
+    prebuild=sed -i '/AndroidBinding/d' project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2
 Current Version Code:3
 
diff --git a/metadata/com.gulshansingh.hackerlivewallpaper.txt b/metadata/com.gulshansingh.hackerlivewallpaper.txt
index b1929ec556..0737400957 100644
--- a/metadata/com.gulshansingh.hackerlivewallpaper.txt
+++ b/metadata/com.gulshansingh.hackerlivewallpaper.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:MIT
 Web Site:http://gulshansingh.com
 Source Code:https://github.com/gsingh93/hacker-live-wallpaper
diff --git a/metadata/com.harasoft.relaunch.txt b/metadata/com.harasoft.relaunch.txt
index d9b4454cf1..3187af9607 100644
--- a/metadata/com.harasoft.relaunch.txt
+++ b/metadata/com.harasoft.relaunch.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://github.com/yiselieren/ReLaunch
 Source Code:https://github.com/yiselieren/ReLaunch
diff --git a/metadata/com.hectorone.multismssender.txt b/metadata/com.hectorone.multismssender.txt
index 416a82fe29..e5ca524511 100644
--- a/metadata/com.hectorone.multismssender.txt
+++ b/metadata/com.hectorone.multismssender.txt
@@ -1,9 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPL
-#Looks like domain expired
-Web Site:http://mathux.dyndns.org/redmine/projects/multismssender2
-Source Code:http://mathux.dyndns.org/redmine/projects/multismssender2/repository/show?rev=Android2.0
-Issue Tracker:http://mathux.dyndns.org/redmine/projects/multismssender2/issues
+Web Site:http://mathux.dyndns.org/
+Source Code:http://mathux.dyndns.org/gitweb/?p=MultiSmsSender.git;a=summary
+Issue Tracker:
 
 Auto Name:Multi Sms
 Summary:Send SMS to many contacts
@@ -21,15 +20,13 @@ Coming features:
 Repo Type:git
 Repo:git://mathux.dyndns.org/MultiSmsSender.git
 
-Build Version:2.0,10,5108804,init=git checkout remotes/origin/Android2.0
-Build Version:2.1,11,ae4b9c9,init=git checkout remotes/origin/Android2.0
-Build Version:2.2,12,c1cb2a3,init=git checkout remotes/origin/Android2.0
-Build Version:2.3,13,95bb2d1,init=git checkout remotes/origin/Android2.0
+Build Version:2.0,10,5108804
+Build Version:2.1,11,ae4b9c9
+Build Version:2.2,12,c1cb2a3
+Build Version:2.3,13,95bb2d1
 
 Auto Update Mode:None
-#Wrong branch for RM
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest/Android2.0
 Current Version:2.3
 Current Version Code:13
 
diff --git a/metadata/com.hermit.btreprap.txt b/metadata/com.hermit.btreprap.txt
index ac7337f2b2..547b6bf5fb 100644
--- a/metadata/com.hermit.btreprap.txt
+++ b/metadata/com.hermit.btreprap.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:CCBYSA
 Web Site:https://github.com/pipakin/Android-Bluetooth-Reprap
 Source Code:https://github.com/pipakin/Android-Bluetooth-Reprap
diff --git a/metadata/com.hexad.bluezime.hidenabler.txt b/metadata/com.hexad.bluezime.hidenabler.txt
index f7a4a8f872..af49ff33ef 100644
--- a/metadata/com.hexad.bluezime.hidenabler.txt
+++ b/metadata/com.hexad.bluezime.hidenabler.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:LGPL
 Web Site:https://code.google.com/p/android-bluez-ime/
-Source Code:https://code.google.com/p/android-bluez-ime/source/list
-Issue Tracker:https://code.google.com/p/android-bluez-ime/issues/list
+Source Code:https://code.google.com/p/android-bluez-ime/source
+Issue Tracker:https://code.google.com/p/android-bluez-ime/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal%40hexad%2edk&item_name=BluezIME%20Donation&no_shipping=2&no_note=1&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8
 
 Auto Name:BluezIME HID Enabler
@@ -11,13 +11,12 @@ Description:
 No description available
 .
 
-Repo Type:svn
-Repo:http://android-bluez-ime.googlecode.com/svn/trunk
+Repo Type:git-svn
+Repo:http://android-bluez-ime.googlecode.com/svn/trunk/BluezIME-HIDEnabler
 
-Build Version:1.0,1,78,subdir=BluezIME-HIDEnabler
+Build Version:1.0,1,78
 
 Auto Update Mode:None
-#device Variable
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
diff --git a/metadata/com.hexad.bluezime.txt b/metadata/com.hexad.bluezime.txt
index 4fea0b91ff..c9c1ac8f97 100644
--- a/metadata/com.hexad.bluezime.txt
+++ b/metadata/com.hexad.bluezime.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:LGPL
 Web Site:https://code.google.com/p/android-bluez-ime/
-Source Code:https://code.google.com/p/android-bluez-ime/source/list
-Issue Tracker:https://code.google.com/p/android-bluez-ime/issues/list
+Source Code:https://code.google.com/p/android-bluez-ime/source
+Issue Tracker:https://code.google.com/p/android-bluez-ime/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal%40hexad%2edk&item_name=BluezIME%20Donation&no_shipping=2&no_note=1&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8
 
 Auto Name:Bluez IME
diff --git a/metadata/com.hobbyone.HashDroid.txt b/metadata/com.hobbyone.HashDroid.txt
index 0f5fe42b2e..f938b40447 100644
--- a/metadata/com.hobbyone.HashDroid.txt
+++ b/metadata/com.hobbyone.HashDroid.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:
 Source Code:https://gitorious.org/hash_droid/hash_droid
@@ -22,8 +22,7 @@ Repo:https://git.gitorious.org/hash_droid/hash_droid.git
 Build Version:3.1,18,3.1
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:3.1
 Current Version Code:18
 
diff --git a/metadata/com.htruong.inputmethod.latin.txt b/metadata/com.htruong.inputmethod.latin.txt
new file mode 100644
index 0000000000..439bebc9d1
--- /dev/null
+++ b/metadata/com.htruong.inputmethod.latin.txt
@@ -0,0 +1,43 @@
+Categories:System
+License:GPLv3
+Web Site:http://www.tnhh.net/2013/04/02/sophia-ime-easter-awesomeness.html
+Source Code:https://github.com/htruong/sophia_oss
+Issue Tracker:https://github.com/htruong/sophia_oss/issues
+
+Auto Name:Sophia keyboard
+Summary:Android Latin keyboard
+Description:
+Keyboard based on AOSP Latin IME, built entirely with Android SDK/NDK.
+For Vietnamese users, Sophia Vietnamese IME automatically adds tone-marks 
+to your Vietnamese input. 
+.
+
+Repo Type:git
+Repo:https://github.com/htruong/sophia_oss.git
+
+Build:1.0.6,6
+    commit=caab7
+    subdir=latinime
+    update=.;../inputmethodcommon;../support-v4
+    prebuild=sed -i '11s/8/11/g' AndroidManifest.xml
+    build=mkdir -p libs && \
+        cd ../inputmethodcommon && \
+        ant release && \
+        cd .. && \
+        cp inputmethodcommon/bin/classes.jar latinime/libs/inputmethodcommon.jar && \
+        cd support-v4 && \
+        ant release && \
+        cd .. && \
+        cp support-v4/bin/classes.jar latinime/libs/android-support-v4.jar 
+    buildjni=yes
+
+Maintainer Notes:
+It's possible Gingerbread support will appear in next version, so remove the 
+manifest patch
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.6
+Current Version Code:6
+
diff --git a/metadata/com.hughes.android.dictionary.txt b/metadata/com.hughes.android.dictionary.txt
index 291f3dd140..9f8a10e0f7 100644
--- a/metadata/com.hughes.android.dictionary.txt
+++ b/metadata/com.hughes.android.dictionary.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/quickdic-dictionary/
-Source Code:http://code.google.com/p/quickdic-dictionary/source/list
-Issue Tracker:http://code.google.com/p/quickdic-dictionary/issues/list
+Source Code:http://code.google.com/p/quickdic-dictionary/source
+Issue Tracker:http://code.google.com/p/quickdic-dictionary/issues
 
 Auto Name:QuickDic
 Summary:Offline translation dictionary
@@ -16,55 +16,90 @@ the wiki page on the website.
 Repo Type:git
 Repo:https://code.google.com/p/quickdic-dictionary.dictionary/
 
-Build Version:3.0.1,15,6507667d0e0af60c201ae6c732c15e2fd07886ae,prebuild=mkdir libs && \
-mv jars/*.jar libs/ && \
-git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
-cd Util && \
-git checkout c848279fde9af59fdd167eacbc5deb0258223c8e && \
-cd .. && \
-cp -r Util/src . && \
-rm -rf Util/
-Build Version:3.1,16,64d2b5,prebuild=mkdir libs && \
-mv jars/*.jar libs/ && \
-git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
-cd Util && \
-git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
-cd .. && \
-cp -r Util/src . && \
-rm -rf Util/
-Build Version:3.2,18,115509,prebuild=mkdir libs && \
-mv jars/*.jar libs/ && \
-git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
-cd Util && \
-git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
-cd .. && \
-cp -r Util/src . && \
-rm -rf Util/
-Build Version:3.2.1,19,66affc8fb893,prebuild=mkdir libs && \
-mv jars/*.jar libs/ && \
-git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
-cd Util && \
-git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
-cd .. && \
-cp -r Util/src . && \
-rm -rf Util/
-Build Version:3.3,21,b50c9fe,prebuild=mkdir libs && \
-mv jars/*.jar libs/ && \
-git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
-cd Util && \
-git checkout 2781abb3e8f4 && \
-cd .. && \
-cp -r Util/src . && \
-rm -rf Util/
-Build Version:4.0.1,23,1950e66885eb,rm=Dictionary_signed.apk,\
-init=git clone https://code.google.com/p/quickdic-dictionary.util/ Util,prebuild=mkdir libs && \
-sed -i 's@\(android.library.reference.1=\).*@\1Util@' project.properties && \
-cd jars/icu4j-4_8_1_1/ && sed -i '108d' build.xml && ant clean collator transliterator moduleJar && \
-mv icu4j.jar ../../libs/
+Build:3.0.1,15
+    commit=6507667d0e0af60c201ae6c732c15e2fd07886ae
+    prebuild=mkdir libs && \
+        mv jars/*.jar libs/ && \
+        git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+        cd Util && \
+        git checkout c848279fde9af59fdd167eacbc5deb0258223c8e && \
+        cd .. && \
+        cp -r Util/src . && \
+        rm -rf Util/
+
+Build:3.1,16
+    commit=64d2b5
+    prebuild=mkdir libs && \
+        mv jars/*.jar libs/ && \
+        git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+        cd Util && \
+        git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
+        cd .. && \
+        cp -r Util/src . && \
+        rm -rf Util/
+
+Build:3.2,18
+    commit=115509
+    prebuild=mkdir libs && \
+        mv jars/*.jar libs/ && \
+        git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+        cd Util && \
+        git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
+        cd .. && \
+        cp -r Util/src . && \
+        rm -rf Util/
+
+Build:3.2.1,19
+    commit=66affc8fb893
+    disable=old failing build
+    prebuild=mkdir libs && \
+        mv jars/*.jar libs/ && \
+        git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+        cd Util && \
+        git checkout c8f5ba9eac5f110d574ef8b443a205051026688c && \
+        cd .. && \
+        cp -r Util/src . && \
+        rm -rf Util/
+
+Build:3.3,21
+    commit=b50c9fe
+    prebuild=mkdir libs && \
+        mv jars/*.jar libs/ && \
+        git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+        cd Util && \
+        git checkout 2781abb3e8f4 && \
+        cd .. && \
+        cp -r Util/src . && \
+        rm -rf Util/
+
+Build:4.0.1,23
+    commit=1950e66885eb
+    init=git clone https://code.google.com/p/quickdic-dictionary.util/ Util && \
+    	cd Util && \
+	git checkout 6beac13a3bc6
+    rm=Dictionary_signed.apk
+    prebuild=mkdir libs && \
+        sed -i 's@\(android.library.reference.1=\).*@\1Util@' project.properties && \
+        cd jars/icu4j-4_8_1_1/ && \
+        sed -i '108d' build.xml && \
+        ant clean collator transliterator moduleJar && \
+        mv icu4j.jar ../../libs/
+
+Build:5.0.1,25
+    commit=3e6ba19f4949
+    srclibs=1:QuickdicUtils@d57bfc6bcf5b;2:ActionBarSherlock@4.4.0
+    rm=Dictionary_signed.apk
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+    	cd jars/icu4j-52_1/ && \
+        ant clean collator transliterator moduleJar && \
+        mv icu4j.jar ../../libs/
+
+Maintainer Notes:
+No tags, but releases can be cross-referenced with the apk in the source repo.
+.
 
 Auto Update Mode:None
-#Cross reference with version of apk in root directory
 Update Check Mode:RepoManifest
-Current Version:4.0.1
-Current Version Code:23
+Current Version:5.0.1
+Current Version Code:25
 
diff --git a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
index 1b0500c8f4..cd7da1468c 100644
--- a/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
+++ b/metadata/com.hyperionics.fbreader.plugin.tts_plus.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:Apache2
 Web Site:http://www.hyperionics.com/?Page=/TtsPlus
 Source Code:https://github.com/gregko/TtsPlus-FBReader
@@ -20,27 +20,77 @@ a crash a dialogue will be displayed requesting your permission to send the logs
 Repo Type:git
 Repo:https://github.com/gregko/TtsPlus-FBReader.git
 
-Build Version:1.5.9,1050090,e36a844b58,rm=TtsPlus-FBReader.apk
-Build Version:1.6.0,1060000,cebaab3202,rm=TtsPlus-FBReader.apk
-Build Version:1.6.1,1060010,2d4c9da30f,rm=TtsPlus-FBReader.apk
-Build Version:1.7.3,1070030,f50149e3,rm=TtsPlus-FBReader.apk
-Build Version:1.7.4,1070040,ff4138b4f,rm=TtsPlus-FBReader.apk
-Build Version:1.9.3,1090030,9f62b881f,rm=TtsPlus-FBReader.apk
-Build Version:2.0.0,2000000,e26ac107c,target=android-15,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:2.0.3,2000030,fc95b396a4,target=android-15,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:2.0.4,2000040,d186f9bf69,target=android-15,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:2.0.5,2000050,d50bdc6ad0,target=android-15,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:2.1.2,2001020,5c5a7683a4,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:2.2.1,2002010,a75651e3e45,rm=TtsPlus-FBReader.apk,\
-prebuild=sed -i -e '/proguard/d' project.properties
+Build:1.5.9,1050090
+    commit=e36a844b58
+    rm=TtsPlus-FBReader.apk
+
+Build:1.6.0,1060000
+    commit=cebaab3202
+    rm=TtsPlus-FBReader.apk
+
+Build:1.6.1,1060010
+    commit=2d4c9da30f
+    rm=TtsPlus-FBReader.apk
+
+Build:1.7.3,1070030
+    commit=f50149e3
+    rm=TtsPlus-FBReader.apk
+
+Build:1.7.4,1070040
+    commit=ff4138b4f
+    rm=TtsPlus-FBReader.apk
+
+Build:1.9.3,1090030
+    commit=9f62b881f
+    rm=TtsPlus-FBReader.apk
+
+Build:2.0.0,2000000
+    commit=e26ac107c
+    target=android-15
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.0.3,2000030
+    commit=fc95b396a4
+    target=android-15
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.0.4,2000040
+    commit=d186f9bf69
+    target=android-15
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.0.5,2000050
+    commit=d50bdc6ad0
+    target=android-15
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.1.2,2001020
+    commit=5c5a7683a4
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.2.1,2002010
+    commit=a75651e3e45
+    rm=TtsPlus-FBReader.apk
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:2.4.0,2004000
+    disable=weird build process
+    commit=b892f639
+    init=rm -f ant.properties local.properties
+    srclibs=1:TtsSetup@06b25e259053dcf38
+
+Build:3.2.1,3020100
+    commit=07f54c2ec9c62
+    srclibs=1:TtsSetup@06b25e259053dcf38
+    disable=uses dropbox sdk?!
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.4.0
-Current Version Code:2004000
+Current Version:3.2.1
+Current Version Code:3020100
 
diff --git a/metadata/com.iazasoft.footguy.txt b/metadata/com.iazasoft.footguy.txt
index dd77fc4531..ab6801dc4b 100644
--- a/metadata/com.iazasoft.footguy.txt
+++ b/metadata/com.iazasoft.footguy.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv2
 Web Site:http://code.google.com/p/footguy/
-Source Code:http://code.google.com/p/footguy/source/checkout
-Issue Tracker:http://code.google.com/p/footguy/issues/list
+Source Code:http://code.google.com/p/footguy/source
+Issue Tracker:http://code.google.com/p/footguy/issues
 
 Auto Name:Footguy
 Summary:Footguy widget
diff --git a/metadata/com.ichi2.anki.txt b/metadata/com.ichi2.anki.txt
index 2297eb51d8..63e4601fc8 100644
--- a/metadata/com.ichi2.anki.txt
+++ b/metadata/com.ichi2.anki.txt
@@ -1,10 +1,10 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://code.google.com/p/ankidroid/wiki/Index
 Source Code:http://github.com/ankidroid/Anki-Android
 Issue Tracker:http://github.com/ankidroid/Anki-Android/issues
 
-Auto Name:
+Auto Name:AnkiDroid
 Summary:A flashcard-based study aid
 Description:
 Anki is a program which makes remembering things easy. Because it is a lot more
@@ -22,79 +22,172 @@ Repo:git://github.com/ankidroid/Anki-Android.git
 #Build Version:0.5,18,v0.5
 #Build Version:0.5.1,19,!There is a v0.5.1 tag but the version code is not right
 #Build Version:0.6,20,f26b7662ae9db9a92d21
-Build Version:0.7,21,v0.7
-Build Version:1.0,23,!Version with Bluetooth
-Build Version:1.1,25,v1.1,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-Build Version:2.0,30,4e4bafed59,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
-#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
-Build Version:2.0,31,!Different version code - same version?
-Build Version:2.0.1,32,v2.0.1,prebuild=sed -i -e "/^key\./d" *.properties
+Build:0.7,21
+    commit=v0.7
 
-Auto Update Mode:None
+Build:1.0,23
+    disable=!Version with Bluetooth
+    commit=unknown - see disabled
+
+Build:1.1,25
+    commit=v1.1
+    forcevercode=yes
+    prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+Build:2.0,30
+    commit=4e4bafed59
+    prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+#Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
+#Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
+Build:2.0,31
+    disable=!Different version code - same version?
+    commit=unknown - see disabled
+
+Build:2.0.1,32
+    commit=v2.0.1
+    prebuild=sed -i -e "/^key\./d" *.properties
+
+Build:2.0.2beta6,37
+    disable=beta version
+
+Build:2.0.2beta8,39
+    disable=beta version
+
+Build:2.0.2,40
+    commit=v2.0.2
+
+Build:2.0.3,43
+    commit=v2.0.3
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.0.2beta6
-Current Version Code:37
+Current Version:2.0.3
+Current Version Code:43
 
diff --git a/metadata/com.ideasfrombrain.search_based_launcher_v2.txt b/metadata/com.ideasfrombrain.search_based_launcher_v2.txt
index 58f5086230..b134cbeeb9 100644
--- a/metadata/com.ideasfrombrain.search_based_launcher_v2.txt
+++ b/metadata/com.ideasfrombrain.search_based_launcher_v2.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:https://github.com/ideasfrombrain/search-based-launcher-v2
 Source Code:https://github.com/ideasfrombrain/search-based-launcher-v2
diff --git a/metadata/com.ihunda.android.binauralbeat.txt b/metadata/com.ihunda.android.binauralbeat.txt
index 434f755513..401da092ba 100644
--- a/metadata/com.ihunda.android.binauralbeat.txt
+++ b/metadata/com.ihunda.android.binauralbeat.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://binauralbeatstherapy.wordpress.com/
 Source Code:https://github.com/GiorgioRegni/Binaural-Beats
@@ -12,30 +12,35 @@ directly into your headphones to produce subtle changes in behavior through
 entrainment of brainwaves frequency. Brain activity operates in waves whose
 frequency can be encouraged to change by the sound waves produced in the app.
 
-This app can help induce relaxation, creativity and many other desirable mental
-states.
+This app claims to help induce relaxation, creativity and many other desirable
+mental states.
 
-*WARNING*
-Binaural beats are very powerful and new presets must be experienced carefully, in a safe
-environment. The app automatically pauses and resume if a phone call arrives.
-This is why PHONE_STATE permissions are required.
+The app automatically pauses and resume if a phone call arrives. This is why
+PHONE_STATE permissions are required.
 .
 
 Repo Type:git
 Repo:https://github.com/GiorgioRegni/Binaural-Beats.git
 
-Build Version:1.2,24,85160b47e80d1cac025d02756f642f3c8f667191
-Build Version:1.3,25,!No source in repo
-Build Version:1.6,29,!973a1ee943cfb251759f5e29137892f262a1d860 but source is incomplete - missing class and drawables
-Build Version:1.6.2,32,!No source in repo
-Build Version:1.7,34,!Source incomplete at e65c60a8ac
-Build Version:2.0.3,39,53723fffe2048,prebuild=\
-sed -i 's/logo_small/icon/g' res/layout/presetlist.xml && \
-sed -i '375d' src/com/ihunda/android/binauralbeat/BBeat.java
+Build:1.2,24
+    commit=85160b47e80d1cac025d02756f642f3c8f667191
+
+Build:2.0.3,39
+    commit=53723fffe2048
+    prebuild=sed -i 's/logo_small/icon/g' res/layout/presetlist.xml && \
+        sed -i '375d' src/com/ihunda/android/binauralbeat/BBeat.java
+
+Build:2.1,40
+    disable=No source code
+
+Maintainer Notes:
+RepoManifest used for indication of changes only. Commits that change
+AndroidManifest.xml are not made at release time, if at all, and source code
+is rarely up to date or correct.
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.0.3
-Current Version Code:39
+Update Check Mode:RepoManifest
+Current Version:2.1
+Current Version Code:40
 
diff --git a/metadata/com.integralblue.callerid.txt b/metadata/com.integralblue.callerid.txt
index d2242231bb..864a67cc0e 100644
--- a/metadata/com.integralblue.callerid.txt
+++ b/metadata/com.integralblue.callerid.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://www.integralblue.com/callerid-for-android
-Source Code:https://gitorious.org/callerid-for-android
+Source Code:https://gitorious.org/callerid-for-android/mainline
 Issue Tracker:
 
 Auto Name:CallerID
@@ -16,12 +16,11 @@ website for more information. The web service is also FOSS.
 Repo Type:git
 Repo:git://gitorious.org/callerid-for-android/mainline.git
 
-Build Version:1.6,7,c54a018930a94d,subdir=application,maven=yes,bindir=application/target,prebuild=\
+Build Version:1.6,7,c54a018930a94d,subdir=application,maven=yes,prebuild=\
 sed -i 's/1.4-SNAPSHOT/1.6/' pom.xml ../pom.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.6
 Current Version Code:7
 
diff --git a/metadata/com.intervigil.micdroid.txt b/metadata/com.intervigil.micdroid.txt
index d18fb21aca..a36303859a 100644
--- a/metadata/com.intervigil.micdroid.txt
+++ b/metadata/com.intervigil.micdroid.txt
@@ -1,4 +1,5 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:GPLv2+
 Web Site:
 Source Code:https://github.com/intervigilium/MicDroid
diff --git a/metadata/com.intrications.android.sharebrowser.txt b/metadata/com.intrications.android.sharebrowser.txt
new file mode 100644
index 0000000000..a6eb853121
--- /dev/null
+++ b/metadata/com.intrications.android.sharebrowser.txt
@@ -0,0 +1,27 @@
+Categories:Internet
+License:Apache2
+Web Site:
+Source Code:https://github.com/intrications/browser-intercept
+Issue Tracker:https://github.com/intrications/browser-intercept/issues
+
+Auto Name:Browser Intercept - Share URL
+Summary:Peek at urls
+Description:
+When opening a web URL from an app Android never show you the address,
+only a choice of browsers or opens the default browser.
+This app allows you to share the URL, so you can see what domain it is.
+You can install [[com.nightshadelabs.anotherbrowser]] to give an option
+to return to a browser option.
+.
+
+Repo Type:git
+Repo:https://github.com/intrications/browser-intercept.git
+
+Build:1.1,2
+    commit=878823bbf01a3e2
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.irahul.worldclock.txt b/metadata/com.irahul.worldclock.txt
index 8b9e2d1530..a45d06a5e8 100644
--- a/metadata/com.irahul.worldclock.txt
+++ b/metadata/com.irahul.worldclock.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/rahulaga/WorldClock
 Source Code:https://github.com/rahulaga/WorldClock
diff --git a/metadata/com.ivanvolosyuk.sharetobrowser.txt b/metadata/com.ivanvolosyuk.sharetobrowser.txt
index 9fc0607687..11cd179c12 100644
--- a/metadata/com.ivanvolosyuk.sharetobrowser.txt
+++ b/metadata/com.ivanvolosyuk.sharetobrowser.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:http://code.google.com/p/share-to-browser/
-Source Code:http://code.google.com/p/share-to-browser/source/checkout
-Issue Tracker:http://code.google.com/p/share-to-browser/issues/list
+Source Code:http://code.google.com/p/share-to-browser/source
+Issue Tracker:http://code.google.com/p/share-to-browser/issues
 
 Auto Name:Send to Computer
 Summary:Send web pages to your computer
@@ -25,8 +25,7 @@ Repo:https://code.google.com/p/share-to-browser/
 Build Version:1.5,7,a884988e72ee,subdir=android,target=android-14
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:7
 
diff --git a/metadata/com.jadn.cc.txt b/metadata/com.jadn.cc.txt
index e427b75a94..0c59ceb2f2 100644
--- a/metadata/com.jadn.cc.txt
+++ b/metadata/com.jadn.cc.txt
@@ -1,5 +1,5 @@
-AntiFeatures:Tracking
-Category:Multimedia
+AntiFeatures:UpstreamNonFree,Tracking
+Categories:Multimedia
 License:MIT
 Web Site:http://jadn.com/carcast/
 Source Code:http://github.com/bherrmann7/Car-Cast/
@@ -17,23 +17,43 @@ last played location.
 # Playback in car/gym (no network needed)
 
 Admob was removed before building.
-Anti-feature: Tracking. Usage data is sent by default thought it can be disable in settings.
+Anti-feature: Tracking. Usage data is sent by default though it can be disabled in settings.
 .
 
 Repo Type:git
 Repo:git://github.com/bherrmann7/Car-Cast.git
 
-Build Version:1.0.129,129,7a879c6bfa51b5d80401b84e031bf4ff2981bb8c,subdir=cc,target=android-8,rm=cc/libs/admob-sdk-android.jar,patch=admob.patch
+Build:1.0.129,129
+    commit=7a879c6bfa51b5d80401b84e031bf4ff2981bb8c
+    subdir=cc
+    target=android-8
+    rm=cc/libs/admob-sdk-android.jar
+    patch=admob.patch
+
 #Note that the above patch no longer applies
-Build Version:1.0.131,131,!Contains proprietary binaries - needs patching or disabling,subdir=cc
-Build Version:1.0.143,143,4b62e71e52,subdir=cc,srclibs=MobAdMob@2d5736,prebuild=\
-echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && rm libs/GoogleAdMobAdsSdk-6.0.0.jar
-Build Version:1.0.154,154,b8bbc8e4fd,subdir=cc,\
-init=rm ../PrestoClient/build.xml,\
-rm=cc/libs/GoogleAdMobAdsSdk-6.0.0.jar,\
-srclibs=MobAdMob@2d5736,\
-update=.;../PrestoClient,\
-prebuild=echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
+Build:1.0.131,131
+    disable=Contains proprietary binaries - needs patching or disabling
+    commit=unknown - see disabled
+    subdir=cc
+
+Build:1.0.143,143
+    commit=4b62e71e52
+    subdir=cc
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        rm libs/GoogleAdMobAdsSdk-6.0.0.jar
+
+Build:1.0.154,154
+    commit=b8bbc8e4fd
+    subdir=cc
+    init=rm ../PrestoClient/build.xml
+    update=.;../PrestoClient
+    rm=cc/libs/GoogleAdMobAdsSdk-6.0.0.jar
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
+
+Build:1.0.155,155
+    disable=no clear commit for this version
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.jakebasile.android.hearingsaver.txt b/metadata/com.jakebasile.android.hearingsaver.txt
index 297fdfe69b..f49abd30d3 100644
--- a/metadata/com.jakebasile.android.hearingsaver.txt
+++ b/metadata/com.jakebasile.android.hearingsaver.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/jakebasile/hearing-saver
 Source Code:https://github.com/jakebasile/hearing-saver
@@ -23,8 +23,7 @@ Build Version:3.0,12,48f670
 Build Version:3.1,13,release-3.1
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:3.1
 Current Version Code:13
 
diff --git a/metadata/com.java.SmokeReducer.txt b/metadata/com.java.SmokeReducer.txt
index 6fbe6bbdeb..567a997049 100644
--- a/metadata/com.java.SmokeReducer.txt
+++ b/metadata/com.java.SmokeReducer.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://www.joshyyy.com/smoke_reducer.html
 Source Code:https://gitorious.org/smoke-reducer/smoke-reducer
diff --git a/metadata/com.jaygoel.virginminuteschecker.txt b/metadata/com.jaygoel.virginminuteschecker.txt
new file mode 100644
index 0000000000..badb902fa3
--- /dev/null
+++ b/metadata/com.jaygoel.virginminuteschecker.txt
@@ -0,0 +1,31 @@
+AntiFeatures:UpstreamNonFree
+Category:Office
+License:NewBSD
+Web Site:http://www.jaygoel.com
+Source Code:https://github.com/poundifdef/VirginMobileMinutesChecker
+Issue Tracker:https://github.com/poundifdef/VirginMobileMinutesChecker/issues
+
+Auto Name:Minutes Checker for Virgin Mobile
+Summary:For Virgin Mobile US customers
+Description:
+Fetches info about the Beyond Talk plan 
+from Virgin Mobile's servers but isn't officially endorsed
+by the company.
+
+A proprietary ad library was removed.
+.
+
+Repo Type:git
+Repo:https://github.com/poundifdef/VirginMobileMinutesChecker.git
+
+Build Version:1.12,13,dc1d1c020c05f,\
+srclibs=1:MobAdMob@2d5736,\
+subdir=VirginMobileMinutesChecker,\
+rm=VirginMobileMinutesChecker/libs/GoogleAdMobAdsSdk-4.1.1.jar
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.12
+Current Version Code:13
+
+
diff --git a/metadata/com.jecelyin.editor.txt b/metadata/com.jecelyin.editor.txt
index be5b74a149..2ea1270d84 100644
--- a/metadata/com.jecelyin.editor.txt
+++ b/metadata/com.jecelyin.editor.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://jecelyin.com
 Source Code:https://github.com/jecelyin/920-Text-Editor
diff --git a/metadata/com.jeyries.quake2.txt b/metadata/com.jeyries.quake2.txt
index b94c90c54d..5a5bbe5928 100644
--- a/metadata/com.jeyries.quake2.txt
+++ b/metadata/com.jeyries.quake2.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://sites.google.com/site/quake2android/
-Source Code:http://code.google.com/p/quake2android/source/checkout
-Issue Tracker:http://code.google.com/p/quake2android/issues/list
+Source Code:http://code.google.com/p/quake2android/source
+Issue Tracker:http://code.google.com/p/quake2android/issues
 
 Auto Name:Quake2
 Summary:Quake 2 for Android
diff --git a/metadata/com.jlyr.txt b/metadata/com.jlyr.txt
index 020f54fe5e..e326cdea33 100644
--- a/metadata/com.jlyr.txt
+++ b/metadata/com.jlyr.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/jlyr/
-Source Code:http://code.google.com/p/jlyr/source/checkout
-Issue Tracker:http://code.google.com/p/jlyr/issues/list
+Source Code:http://code.google.com/p/jlyr/source
+Issue Tracker:http://code.google.com/p/jlyr/issues
 
 Auto Name:JLyr Lyrics
 Summary:Get lyrics
diff --git a/metadata/com.jmartin.temaki.txt b/metadata/com.jmartin.temaki.txt
new file mode 100644
index 0000000000..a422f8bf05
--- /dev/null
+++ b/metadata/com.jmartin.temaki.txt
@@ -0,0 +1,23 @@
+Categories:Office
+License:Apache2
+Source Code:https://github.com/jeffxmn/temaki
+Issue Tracker:https://github.com/jeffxmn/temaki/issues
+
+Auto Name:Temaki
+Summary:List maker
+Description:
+Manage your lists.
+.
+
+Repo Type:git
+Repo:https://github.com/jeffxmn/temaki.git
+
+Build:1.41,11
+    commit=v1.41
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.41
+Current Version Code:11
+
diff --git a/metadata/com.jonglen7.jugglinglab.txt b/metadata/com.jonglen7.jugglinglab.txt
new file mode 100644
index 0000000000..f69d7e9d4e
--- /dev/null
+++ b/metadata/com.jonglen7.jugglinglab.txt
@@ -0,0 +1,30 @@
+Categories:Games
+License:GPLv3
+Web Site:http://jugglinglab.sourceforge.net
+Source Code:http://code.google.com/p/jugglinglab/source
+Issue Tracker:http://code.google.com/p/jugglinglab/issues
+
+Auto Name:Juggling Lab
+Summary:Animated juggling patterns
+Description:
+Based on the desktop software, also called Juggling lab.
+.
+
+Repo Type:git-svn
+Repo:http://jugglinglab.googlecode.com/svn/trunk/
+
+Build:1.1,3
+    commit=251
+    init=echo 'target=android-16' > project.properties
+    srclibs=1:GreenDroid@greendroid-0.2;2:SuperDryColorPicker@5c488
+
+Build:1.2,4
+    commit=254
+    init=echo 'target=android-16' > project.properties
+    srclibs=1:GreenDroid@greendroid-0.2;2:SuperDryColorPicker@5c488
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:4
+
diff --git a/metadata/com.josegd.monthcalwidget.txt b/metadata/com.josegd.monthcalwidget.txt
index 3a7a0bde2c..6884208a7d 100644
--- a/metadata/com.josegd.monthcalwidget.txt
+++ b/metadata/com.josegd.monthcalwidget.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Unknown
 Web Site:https://github.com/JoseGD/MonthCalendarWidget
 Source Code:https://github.com/JoseGD/MonthCalendarWidget
@@ -18,10 +18,12 @@ application, like Google Calendar.
 Repo Type:git
 Repo:https://github.com/JoseGD/MonthCalendarWidget.git
 
-Build Version:1.2.0,3,!unknown licence 1.2.0
+Build:1.2.0,3
+    disable=unknown licence 1.2.0
+    commit=unknown - see disabled
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.3.1
-Current Version Code:5
+Current Version:1.5.0
+Current Version Code:7
 
diff --git a/metadata/com.jotabout.screeninfo.txt b/metadata/com.jotabout.screeninfo.txt
index 05f6043383..9fb5288c27 100644
--- a/metadata/com.jotabout.screeninfo.txt
+++ b/metadata/com.jotabout.screeninfo.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:MIT
 Web Site:http://digitaldumptruck.jotabout.com
 Source Code:https://github.com/mportuesisf/ScreenInfo
diff --git a/metadata/com.joulespersecond.seattlebusbot.txt b/metadata/com.joulespersecond.seattlebusbot.txt
index f17527279f..0a58286e65 100644
--- a/metadata/com.joulespersecond.seattlebusbot.txt
+++ b/metadata/com.joulespersecond.seattlebusbot.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://www.onebusaway.org/
 Source Code:https://github.com/OneBusAway/onebusaway-android
diff --git a/metadata/com.jpkrause.c_feed.txt b/metadata/com.jpkrause.c_feed.txt
index 96a3128f59..f70d4c0261 100644
--- a/metadata/com.jpkrause.c_feed.txt
+++ b/metadata/com.jpkrause.c_feed.txt
@@ -1,5 +1,5 @@
 Disabled:Copyright problems for content
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:
 Source Code:https://github.com/jpkrause/C-Feed
diff --git a/metadata/com.jwetherell.heart_rate_monitor.txt b/metadata/com.jwetherell.heart_rate_monitor.txt
index eb674e84bc..8febcd7b84 100644
--- a/metadata/com.jwetherell.heart_rate_monitor.txt
+++ b/metadata/com.jwetherell.heart_rate_monitor.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://code.google.com/p/android-heart-rate-monitor/
-Source Code:http://code.google.com/p/android-heart-rate-monitor/source/checkout
-Issue Tracker:http://code.google.com/p/android-heart-rate-monitor/issues/list
+Source Code:http://code.google.com/p/android-heart-rate-monitor/source
+Issue Tracker:http://code.google.com/p/android-heart-rate-monitor/issues
 
 Auto Name:HeartRateMonitor
 Summary:Heart Rate Monitor
diff --git a/metadata/com.kaeruct.glxy.txt b/metadata/com.kaeruct.glxy.txt
index e50bccdf37..5d60bc309a 100644
--- a/metadata/com.kaeruct.glxy.txt
+++ b/metadata/com.kaeruct.glxy.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:https://github.com/KaeruCT/GLXY#glxy
 Source Code:https://github.com/KaeruCT/GLXY
@@ -13,7 +13,16 @@ A simplified gravity simulator for Android, build with libgdx.
 Repo Type:git
 Repo:https://github.com/KaeruCT/GLXY.git
 
-Build Version:1.0,1,!contains .so files at 1.0,subdir=glxy-android
+Build:1.0,1
+    commit=1.0
+    subdir=glxy-android
+    extlibs=libgdx/libgdx-0.9.8.zip
+	prebuild=rm -rf libs/*.jar
+    build=mkdir gdx && unzip libs/libgdx-0.9.8.zip -d gdx/ && rm -rf libs && \
+ 		mkdir -p libs/armeabi{,-v7a} && \
+		mv gdx/gdx-backend-android.jar libs/ && \
+		mv gdx/armeabi/lib{gdx,androidgl20}.so libs/armeabi/ && \
+		mv gdx/armeabi-v7a/lib{gdx,androidgl20}.so libs/armeabi-v7a/
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.kai1973i.txt b/metadata/com.kai1973i.txt
index 25933d4ddc..c583b6f4de 100644
--- a/metadata/com.kai1973i.txt
+++ b/metadata/com.kai1973i.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://code.google.com/p/auroraapp/
-Source Code:http://code.google.com/p/auroraapp/source/checkout
-Issue Tracker:http://code.google.com/p/auroraapp/issues/list
+Source Code:http://code.google.com/p/auroraapp/source
+Issue Tracker:http://code.google.com/p/auroraapp/issues
 
 Name:aAuroraApp
 Auto Name:aAuroraApp (Alpha)
diff --git a/metadata/com.kibab.android.EncPassChanger.txt b/metadata/com.kibab.android.EncPassChanger.txt
index 95820ffaaf..85356f30db 100644
--- a/metadata/com.kibab.android.EncPassChanger.txt
+++ b/metadata/com.kibab.android.EncPassChanger.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:https://github.com/kibab/encpasschanger
 Source Code:https://github.com/kibab/encpasschanger
@@ -33,8 +33,7 @@ Build Version:1.0,1,97df69b6d
 Build Version:2.0,2,691b12e9a2
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0
 Current Version Code:2
 
diff --git a/metadata/com.kirit.android.mintercept.txt b/metadata/com.kirit.android.mintercept.txt
index fc843b86c1..0ef317a974 100644
--- a/metadata/com.kirit.android.mintercept.txt
+++ b/metadata/com.kirit.android.mintercept.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://www.kirit.com/Missile%20intercept
 Source Code:http://www.kirit.com/Missile%20intercept
@@ -11,12 +11,13 @@ A game in the style of the classic Missile Command. Defend your cities from inco
 enemy missiles.
 .
 
-Repo Type:svn
-Repo:http://svn.felspar.com/public/m-intercept/trunk/android
+Repo Type:git-svn
+Repo:http://svn.felspar.com/public/m-intercept;trunk=trunk;tags=tags
+
+Build Version:0.5.1,6,40186,subdir=android,target=android-7
 
 Auto Update Mode:None
-#Build Version:0.5.1,6,!wait for client 40186,target=android-7,prebuild=rm -rf tests
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.5.1
 Current Version Code:6
 
diff --git a/metadata/com.kkinder.charmap.txt b/metadata/com.kkinder.charmap.txt
index c06ac7f66e..1c55911215 100644
--- a/metadata/com.kkinder.charmap.txt
+++ b/metadata/com.kkinder.charmap.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:http://kkinder.com/charmap
 Source Code:https://bitbucket.org/dalb8/charmap
@@ -21,8 +21,7 @@ Repo:https://bitbucket.org/dalb8/charmap
 Build Version:1.0.1,101,1307b92
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:101
 
diff --git a/metadata/com.kkinder.sharelocation.txt b/metadata/com.kkinder.sharelocation.txt
index cdbd0719e2..d5f5f0e019 100644
--- a/metadata/com.kkinder.sharelocation.txt
+++ b/metadata/com.kkinder.sharelocation.txt
@@ -1,6 +1,6 @@
 Disabled:Google Maps shenanigans
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:MIT
 Web Site:https://bitbucket.org/kkinder/gpsshare
 Source Code:https://bitbucket.org/kkinder/gpsshare/src
@@ -22,8 +22,7 @@ Repo:https://bitbucket.org/kkinder/gpsshare
 Build Version:1.4.1,141,936cada
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.1
 Current Version Code:141
 
diff --git a/metadata/com.kmagic.solitaire.txt b/metadata/com.kmagic.solitaire.txt
index c4f3f699b2..267d407e34 100644
--- a/metadata/com.kmagic.solitaire.txt
+++ b/metadata/com.kmagic.solitaire.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:http://code.google.com/p/solitaire-for-android/
-Source Code:http://code.google.com/p/solitaire-for-android/source/checkout
-Issue Tracker:http://code.google.com/p/solitaire-for-android/issues/list
+Source Code:http://code.google.com/p/solitaire-for-android/source
+Issue Tracker:http://code.google.com/p/solitaire-for-android/issues
 
 Auto Name:Solitaire
 Summary:Solitaire collection
@@ -12,14 +12,13 @@ and Freecell using the touchscreen interface. Features include multi-level
 undo, animated card movement, and statistic/score tracking.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://solitaire-for-android.googlecode.com/svn/trunk/
 
 Build Version:1.12.2,450,30,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.12.2
 Current Version Code:450
 
diff --git a/metadata/com.knirirr.beecount.txt b/metadata/com.knirirr.beecount.txt
new file mode 100644
index 0000000000..9899ed1b32
--- /dev/null
+++ b/metadata/com.knirirr.beecount.txt
@@ -0,0 +1,35 @@
+Categories:Office
+License:Apache2
+Web Site:http://code.google.com/p/beecount
+Source Code:http://code.google.com/p/beecount/source
+Issue Tracker:http://code.google.com/p/beecount/issues
+
+Auto Name:BeeCount
+Summary:Knitting row counter
+Description:
+A knitting project helper, with the following features:
+* Keep track of several knitting projects.
+* For each project, track several items which need counting, e.g. rows, pattern repeats etc
+* Allow counting up, down and re-setting to zero of these counts.
+* Allow editing of projects to add, remove or change counts after project creation.
+* Link counts together so that one increments another.
+* Set row alerts and cause counts to reset at particular values.
+* Allow backing up and restoring of the entire projects database. 
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/beecount/
+
+Build:1.2.1,47
+    commit=1.2.1
+    target=android-15
+
+Build:1.2.2,48
+    commit=1.2.2
+    target=android-15
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.2.2
+Current Version Code:48
+
diff --git a/metadata/com.kostmo.wallpaper.spiral.txt b/metadata/com.kostmo.wallpaper.spiral.txt
index 54391ddb44..bde7ce3fe1 100644
--- a/metadata/com.kostmo.wallpaper.spiral.txt
+++ b/metadata/com.kostmo.wallpaper.spiral.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:http://code.google.com/p/android-spiral-wallpaper/
-Source Code:http://code.google.com/p/android-spiral-wallpaper/source/checkout
-Issue Tracker:http://code.google.com/p/android-spiral-wallpaper/issues/list
+Source Code:http://code.google.com/p/android-spiral-wallpaper/source
+Issue Tracker:http://code.google.com/p/android-spiral-wallpaper/issues
 
 Auto Name:HypnoTwister
 Summary:An animated spiral live wallpaper
@@ -11,14 +11,13 @@ Draws animated mathematically perfect spirals on your home screen.
 .
 
 Repo Type:git-svn
-Repo:http://android-spiral-wallpaper.googlecode.com/svn/trunk/
+Repo:http://android-spiral-wallpaper.googlecode.com/svn/trunk/app
 
-Build Version:1.4,12,14,subdir=app,prebuild=mv lib libs
-Build Version:1.4.1,13,16,subdir=app
+Build Version:1.4,12,14,prebuild=mv lib libs
+Build Version:1.4.1,13,16
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.1
 Current Version Code:13
 
diff --git a/metadata/com.kpz.pomodorotasks.activity.txt b/metadata/com.kpz.pomodorotasks.activity.txt
index 2b1ce9c089..2fa8ac5cf3 100644
--- a/metadata/com.kpz.pomodorotasks.activity.txt
+++ b/metadata/com.kpz.pomodorotasks.activity.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/pomodorotasks/
-Source Code:http://code.google.com/p/pomodorotasks/source/checkout
-Issue Tracker:http://code.google.com/p/pomodorotasks/issues/list
+Source Code:http://code.google.com/p/pomodorotasks/source
+Issue Tracker:http://code.google.com/p/pomodorotasks/issues
 
 Auto Name:Pomodoro Tasks
 Summary:Task Manager
@@ -13,12 +13,16 @@ A simple application to manage tasks using Pomodoro Technique.
 Repo Type:git-svn
 Repo:http://pomodorotasks.googlecode.com/svn/trunk/
 
-Build Version:1.4,7,97,subdir=PomodoroTasks
-Build Version:1.5,8,99,subdir=PomodoroTasks
+Build:1.4,7
+    commit=97
+    subdir=PomodoroTasks
+
+Build:1.5,8
+    commit=99
+    subdir=PomodoroTasks
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.4
-Current Version Code:7
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:8
 
diff --git a/metadata/com.kvance.Nectroid.txt b/metadata/com.kvance.Nectroid.txt
index aedeba0645..51dc41765d 100644
--- a/metadata/com.kvance.Nectroid.txt
+++ b/metadata/com.kvance.Nectroid.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/nectroid/
-Source Code:http://code.google.com/p/nectroid/source/checkout
-Issue Tracker:http://code.google.com/p/nectroid/issues/list
+Source Code:http://code.google.com/p/nectroid/source
+Issue Tracker:http://code.google.com/p/nectroid/issues
 
 Auto Name:Nectroid
 Summary:Demoscene radio
@@ -24,8 +24,7 @@ Build Version:1.2.3,10,61,buildjni=jni
 Build Version:1.2.4,11,65,buildjni=jni
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.4
 Current Version Code:11
 
diff --git a/metadata/com.kyakujin.android.tagnotepad.txt b/metadata/com.kyakujin.android.tagnotepad.txt
new file mode 100644
index 0000000000..68073926e5
--- /dev/null
+++ b/metadata/com.kyakujin.android.tagnotepad.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:Apache2
+Web Site:https://github.com/Kyakujin/TagNotepad
+Source Code:https://github.com/Kyakujin/TagNotepad
+Issue Tracker:https://github.com/Kyakujin/TagNotepad/issues
+
+Auto Name:TAG Notepad
+Summary:Tag-based notebook
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/Kyakujin/TagNotepad.git
+
+Build:1.0.2,3
+    commit=5f68
+    srclibs=1:ActionBarSherlock@4.4.0
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.2
+Current Version Code:3
+
diff --git a/metadata/com.leafdigital.kanji.android.txt b/metadata/com.leafdigital.kanji.android.txt
index 2f80ed66f0..6344ef57c6 100644
--- a/metadata/com.leafdigital.kanji.android.txt
+++ b/metadata/com.leafdigital.kanji.android.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/quen/kanjirecog/tree/android
 Source Code:https://github.com/quen/kanjirecog/tree/android
@@ -18,19 +18,6 @@ the clipboard as text for use in a dictionary.
 Note that this will NOT work - at all - if you don't know basically how to draw kanji. If you just draw
 something any old way that looks like it, it certainly won't be recognised. You have to draw characters
 basically the official way.
-
-That said there are two forms of recognition: exact (you must enter the character with the correct
-stroke count, stroke order, and direction) and inexact (you must draw basically the correct strokes
-but can use any order and direction). If the inexact search doesn't find it, you can try searching
-for characters with 1 stroke more or fewer than you drew. This might sound complicated but the
-interface is easy; you get exact results straight away, if it's not there then hit the button and wait
-for inexact results (this takes several seconds, there's a progress bar), and if it's not there either,
-you can go onto the +/- 1 results.
-
-Notes:
-# If you've drawn a character and the 'Done' button is still greyed out, this is because it's still loading the data file. It usually only takes a few seconds, so please wait. This only happens the first time you draw a character after starting the app.
-# Some characters don't work very well if you draw them in the normal handwriting style. The data is based on print style. If you have difficulty getting a character recognised, try drawing it like the print version.
-# This program is based on the leafdigital kanjirecog library in the same source repo. Uses kanji drawing database derived from the SVG kanji stroke order images produced by the KanjiVG project and released under Creative Commons Attribution-Share Alike 3.0 license. See [http://kanjivg.tagaini.net kanjivg.tagaini.net].
 .
 
 Repo Type:git
@@ -39,8 +26,7 @@ Repo:https://github.com/quen/kanjirecog.git
 Build Version:1.0,2,63fca25a224,prebuild=rm -rf tests design
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest/android
 Current Version:1.0
 Current Version Code:2
 
diff --git a/metadata/com.lecz.android.tiltmazes.txt b/metadata/com.lecz.android.tiltmazes.txt
index d4d1905a5c..c0a0ed0ffb 100644
--- a/metadata/com.lecz.android.tiltmazes.txt
+++ b/metadata/com.lecz.android.tiltmazes.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:NewBSD
 Web Site:http://code.google.com/p/tiltmazes/
-Source Code:http://code.google.com/p/tiltmazes/source/checkout
-Issue Tracker:http://code.google.com/p/tiltmazes/issues/list
+Source Code:http://code.google.com/p/tiltmazes/source
+Issue Tracker:http://code.google.com/p/tiltmazes/issues
 
 Auto Name:TiltMazes
 Summary:Logical puzzle game
@@ -13,13 +13,13 @@ literally, start the ball rolling. The ball rolls in a straight line until it hi
 a wall, you can then tilt again.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://tiltmazes.googlecode.com/svn/trunk
 
+Build Version:1.2,3,51,target=android-4
+
 Auto Update Mode:None
-#Build Version:1.2,3,!wait for client 51,target=android-4
-#Not updated since 02/2009
-Update Check Mode:Static
+Update Check Mode:RepoManifest
 Current Version:1.2
 Current Version Code:3
 
diff --git a/metadata/com.leinardi.kitchentimer.txt b/metadata/com.leinardi.kitchentimer.txt
index 46612d6db1..87d40d0021 100644
--- a/metadata/com.leinardi.kitchentimer.txt
+++ b/metadata/com.leinardi.kitchentimer.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://code.google.com/p/kitchentimer/
-Source Code:https://code.google.com/p/kitchentimer/source/checkout
-Issue Tracker:https://code.google.com/p/kitchentimer/issues/list
+Source Code:https://code.google.com/p/kitchentimer/source
+Issue Tracker:https://code.google.com/p/kitchentimer/issues
 
 Auto Name:Kitchen Timer
 Summary:Simple Timer
diff --git a/metadata/com.liato.bankdroid.txt b/metadata/com.liato.bankdroid.txt
index bb1ec38ade..60edc09709 100644
--- a/metadata/com.liato.bankdroid.txt
+++ b/metadata/com.liato.bankdroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://www.swedroid.se/forum/showthread.php?t=11108
 Source Code:https://github.com/liato/android-bankdroid
@@ -20,29 +20,124 @@ Repo:https://github.com/liato/android-bankdroid.git
 # doesn't work with platform tools newer than 6 anyway, and apparently wouldn't
 # work on devices anyway, it would inherit either nothing, or the wrong thing!
 # Ref: http://groups.google.com/group/android-developers/browse_thread/thread/550fce9670530d9b
-Build Version:1.6.3,102,612aae755a82008f44a6,encoding=utf-8,extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar,prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
-Build Version:1.7.2,110,fec08e34a157a3e0b455,encoding=utf-8,extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar,prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
-Build Version:1.7.3,115,!a08cab7e66c70e7b0f5c but wrong version code in repo
-Build Version:1.8.0,120,899e4b957e512bf55254,encoding=utf-8,extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar,prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
-Build Version:1.8.1,121,b5f637bbb301aa2fe997c9f3367cfb144d158633,encoding=utf-8,extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar,prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
-Build Version:1.8.1,121,9f626b0dedb01cb90a16fb127a041c5f3dd1c579,target=android-10,encoding=utf-8,extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar,prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
-Build Version:1.8.5,128,263023cd883da7b12c94cb46b9d3fdd23068446c,target=android-11,encoding=utf-8,prebuild=mv lib libs
-Build Version:1.8.5,128,e6582cc4249e2d6ba6a8630322a5dc26e54d35ff,target=android-11,encoding=utf-8,prebuild=mv lib libs
-Build Version:1.8.7,131,e6582cc4249e2d6ba6a8630322a5dc26e54d35ff,target=android-11,encoding=utf-8,prebuild=mv lib libs
-Build Version:1.8.9,134,d0742fc779d6d87b8e5d27359cff149d658983a4,target=android-11,encoding=utf-8,prebuild=mv lib libs
-Build Version:1.9.0,137,50ebd2e433d,target=android-11,encoding=utf-8,forcevercode=yes
-Build Version:1.9.1,140,6dd58b516
-Build Version:1.9.2,142,!no source
-Build Version:1.9.5.1,148,1f52896b4
-Build Version:1.9.5.3,154,e7fa552ef144d5
-Build Version:1.9.5.4,155,v1.9.5.4
-Build Version:1.9.6.0,160,296bc911b2f639
-Build Version:1.9.6.1,161,v1.9.6.1
-Build Version:1.9.6.2-RC1,162,!not building RCs of this
+Build:1.6.3,102
+    commit=612aae755a82008f44a6
+    encoding=utf-8
+    extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar
+    prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
+
+Build:1.7.2,110
+    commit=fec08e34a157a3e0b455
+    encoding=utf-8
+    extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar
+    prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
+
+Build:1.7.3,115
+    disable=a08cab7e66c70e7b0f5c but wrong version code in repo
+    commit=unknown - see disabled
+
+Build:1.8.0,120
+    commit=899e4b957e512bf55254
+    encoding=utf-8
+    extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar
+    prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
+
+Build:1.8.1,121
+    commit=b5f637bbb301aa2fe997c9f3367cfb144d158633
+    encoding=utf-8
+    extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar
+    prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
+
+Build:1.8.1,121
+    commit=9f626b0dedb01cb90a16fb127a041c5f3dd1c579
+    target=android-10
+    encoding=utf-8
+    extlibs=commons-io/commons-io-2.0.1.jar;guava-r08/guava-r08.jar
+    prebuild=sed -i "s@parent=\"android:WindowTitleBackground\"@@" res/values/styles.xml
+
+Build:1.8.5,128
+    commit=263023cd883da7b12c94cb46b9d3fdd23068446c
+    target=android-11
+    encoding=utf-8
+    prebuild=mv lib libs
+
+Build:1.8.5,128
+    commit=e6582cc4249e2d6ba6a8630322a5dc26e54d35ff
+    target=android-11
+    encoding=utf-8
+    prebuild=mv lib libs
+
+Build:1.8.7,131
+    commit=e6582cc4249e2d6ba6a8630322a5dc26e54d35ff
+    target=android-11
+    encoding=utf-8
+    prebuild=mv lib libs
+
+Build:1.8.9,134
+    commit=d0742fc779d6d87b8e5d27359cff149d658983a4
+    target=android-11
+    encoding=utf-8
+    prebuild=mv lib libs
+
+Build:1.9.0,137
+    commit=50ebd2e433d
+    target=android-11
+    encoding=utf-8
+    forcevercode=yes
+
+Build:1.9.1,140
+    commit=6dd58b516
+
+Build:1.9.2,142
+    disable=no source
+    commit=unknown - see disabled
+
+Build:1.9.5.1,148
+    commit=1f52896b4
+
+Build:1.9.5.3,154
+    commit=e7fa552ef144d5
+
+Build:1.9.5.4,155
+    commit=v1.9.5.4
+
+Build:1.9.6.0,160
+    commit=296bc911b2f639
+
+Build:1.9.6.1,161
+    commit=v1.9.6.1
+
+Build:1.9.6.2-RC1,162
+    disable=not building RCs of this
+
+Build:1.9.6.2,166
+    commit=53344629d
+    extlibs=commons-io/commons-io-2.0.1.jar;jsoup/jsoup-1.7.2.jar;jackson/jackson-annotations-2.1.0.jar;jackson/jackson-core-2.1.0.jar;jackson/jackson-databind-2.1.0.jar;guava-r08/guava-r08.jar
+
+Build:1.9.6.3-RC2,168
+    disable=not building RCs of this
+
+Build:1.9.6.4-RC3,172
+    disable=not building RCs of this
+
+Build:1.9.6.4,173
+    commit=v1.9.6.4
+    extlibs=commons-io/commons-io-2.0.1.jar;jsoup/jsoup-1.7.2.jar;jackson/jackson-annotations-2.1.0.jar;jackson/jackson-core-2.1.0.jar;jackson/jackson-databind-2.1.0.jar;guava-r08/guava-r08.jar
+
+Build:1.9.6.5,174
+    commit=v1.9.6.5
+    extlibs=commons-io/commons-io-2.0.1.jar;jsoup/jsoup-1.7.2.jar;jackson/jackson-annotations-2.1.0.jar;jackson/jackson-core-2.1.0.jar;jackson/jackson-databind-2.1.0.jar;guava-r08/guava-r08.jar
+
+Maintainer Notes:
+As of 1.9.6.2 it's supposed to build with gradle but it doesn't - it complains
+that res/drawable-hdpi-v4/button_bg_pressed__2.9.2010-07-02_1022.png is not a
+valid filename (apparently due to the hyphens). So building it with ant and
+using extlibs for the dependencies (which used to be in the source repo as
+binaries anyway).
+.
 
 Auto Update Mode:None
-# Briefly used tags (not anymore)
-Update Check Mode:RepoManifest
-Current Version:1.9.6.2-RC1
-Current Version Code:162
+Update Check Mode:Tags
+Current Version:1.9.6.5
+Current Version Code:174
 
diff --git a/metadata/com.lightbox.android.camera.txt b/metadata/com.lightbox.android.camera.txt
new file mode 100644
index 0000000000..97f7906485
--- /dev/null
+++ b/metadata/com.lightbox.android.camera.txt
@@ -0,0 +1,27 @@
+Category:Multimedia
+License:Apache2
+Web Site:http://lightbox.com
+Source Code:https://github.com/lightbox/QuickSnap
+Issue Tracker:https://github.com/lightbox/QuickSnap/issues
+
+Auto Name:QuickSnap
+Summary:Basic camera app
+Description:
+Camera implementation based off the Android Gingerbread camera app source code.
+
+Initially the Android Gingerbread camera source was forked, and then modified 
+to become backwards compatible down to API level 7 (Eclair). 
+The video functionality has also been removed and other changes made to fix
+problems with indivdual devices.
+.
+
+Repo Type:git
+Repo:https://github.com/lightbox/QuickSnap
+
+Build Version:1.0.1,2,d226fda623,subdir=Camera,target=android-14
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.1
+Current Version Code:2
+
diff --git a/metadata/com.linkomnia.android.Changjie.txt b/metadata/com.linkomnia.android.Changjie.txt
new file mode 100644
index 0000000000..e235ceb192
--- /dev/null
+++ b/metadata/com.linkomnia.android.Changjie.txt
@@ -0,0 +1,31 @@
+Categories:System
+License:GPLv3
+Web Site:
+Source Code:https://github.com/wanleung/ChangjieIME
+Issue Tracker:https://github.com/wanleung/ChangjieIME/issues
+
+Auto Name:Changjie Input Method
+Summary:Chinese keyboard
+Description:
+Supported Changjie ( Cangjie ) version 3 and 5, and Quick Method,
+with Phases support.
+
+The project is based on the new ibus-cangjie based 
+[https://github.com/Cangjians library] libcangjie.
+The dictionary is based on [http://cle.linux.org.tw/trac gcin].
+.
+
+Repo Type:git
+Repo:https://github.com/wanleung/ChangjieIME.git
+
+Build:0.1,3
+    commit=6b3a58f0726bfb387a
+
+Build:0.3.1,7
+    commit=v0.3.1
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:0.3.1
+Current Version Code:7
+
diff --git a/metadata/com.littlebytesofpi.pylauncher.txt b/metadata/com.littlebytesofpi.pylauncher.txt
new file mode 100644
index 0000000000..5258106a75
--- /dev/null
+++ b/metadata/com.littlebytesofpi.pylauncher.txt
@@ -0,0 +1,31 @@
+Categories:Development
+License:MIT
+Web Site:http://littlebytesofpi.com/index.php/projects/our-pro/tcp-client-serve
+Source Code:https://bitbucket.org/gbriggs/lbp_tcpipsockets/src
+Issue Tracker:https://bitbucket.org/gbriggs/lbp_tcpipsockets/issues
+
+Auto Name:pyLauncher
+Summary:Launch scripts on a server
+Description:
+Install the server (see the source code page) on a Raspberry PI (or other) then launch Python program 
+files from the user interface on the Android. 
+The results of the program are returned to the Android application, and 
+displayed on the screen.
+
+* Connect any number of pyLauncher Android clients to the server on your local area network.
+* Select a Python.py file from the Android user interface, and have it run on the Raspberry Pi. 
+* Results of each Python file run are broadcast to all connected Android clients
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/gbriggs/lbp_tcpipsockets.git
+
+Build:1.0.8,4
+    commit=1.0.8
+    subdir=AndroidClient/pyLauncher
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.8
+Current Version Code:4
+
diff --git a/metadata/com.lukekorth.screennotifications.txt b/metadata/com.lukekorth.screennotifications.txt
index 0c54c43370..14602e3026 100644
--- a/metadata/com.lukekorth.screennotifications.txt
+++ b/metadata/com.lukekorth.screennotifications.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://lukekorth.com
 Source Code:https://github.com/lkorth/screen-notifications
diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt
index cb83685752..31f4dfd0fe 100644
--- a/metadata/com.madgag.agit.txt
+++ b/metadata/com.madgag.agit.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:GPLv3
 Web Site:https://github.com/rtyley/agit/wiki
 Source Code:https://github.com/rtyley/agit
@@ -20,7 +20,7 @@ Currently this is a 'read-only' client. You can clone & fetch, but not commit an
 Repo Type:git
 Repo:https://github.com/rtyley/agit.git
 
-Build Version:1.34,130300622,agit-parent-1.34,maven=yes,bindir=agit/target,novcheck=yes
+Build Version:1.34,130300716,agit-parent-1.34,maven=yes,bindir=agit/target,novcheck=yes
 Build Version:1.38,130400912,agit-parent-1.38,maven=yes,prebuild=\
 sed -i '/agit-integration-tests/d' pom.xml,bindir=agit/target,novcheck=yes
 
diff --git a/metadata/com.manor.currentwidget.txt b/metadata/com.manor.currentwidget.txt
index f24b79907f..c28fe9b7b5 100644
--- a/metadata/com.manor.currentwidget.txt
+++ b/metadata/com.manor.currentwidget.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/currentwidget/
-Source Code:http://code.google.com/p/currentwidget/source/list
-Issue Tracker:http://code.google.com/p/currentwidget/issues/list
+Source Code:http://code.google.com/p/currentwidget/source
+Issue Tracker:http://code.google.com/p/currentwidget/issues
 Donate:http://code.google.com/p/currentwidget/
 
 Auto Name:
@@ -54,13 +54,7 @@ mkdir -p src/ && rm -rf ../CurrentWidgetLibrary/bin && \
 mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
 printf "android.library=true\nandroid.library.reference.1=$$Color-Picker-2$$" >> \
 ../CurrentWidgetLibrary/project.properties
-Build Version:0.39a,39,290,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
-srclibs=Color-Picker-2@45ee6554a1db,target=android-17,prebuild=\
-printf "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
-mkdir -p src/ && rm -rf ../CurrentWidgetLibrary/bin && \
-mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
-printf "android.library=true\nandroid.library.reference.1=$$Color-Picker-2$$" >> \
-../CurrentWidgetLibrary/project.properties
+Build Version:0.39a,39,290,disable=Proprietary dependencies just so you can 'rate' the widget!?
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.manuelmaly.hn.txt b/metadata/com.manuelmaly.hn.txt
index b4f73c5060..d72b235938 100644
--- a/metadata/com.manuelmaly.hn.txt
+++ b/metadata/com.manuelmaly.hn.txt
@@ -1,4 +1,5 @@
-Category:Reading
+AntiFeatures:UpstreamNonFree
+Categories:Reading
 License:MIT
 Web Site:http://manuelmaly.com/blog/HN-Hacker-News-Reader
 Source Code:https://github.com/manmal/hn-android
@@ -16,27 +17,44 @@ Hacker News client with a focus on reliability and usability.
 * Switch between stories and comments with one tap
 * View "more" stories than only the HN frontpage
 
-Google Analytics was removed before building.
+A proprietary analytics library was removed before building.
 .
 
 Repo Type:git
 Repo:https://github.com/manmal/hn-android.git
 
-Build Version:1.9,10,313f0c48,srclibs=NoAnalytics@158a4a,\
-rm=libs/libGoogleAnalytics.jar,prebuild=\
-echo 'android.library.reference.1=$$NoAnalytics$$' >> project.properties && \
-mv androidannotations-2.5.jar libs/ && rm libs/androidannotations-2.5-api.jar
-Build Version:1.9.1,11,RELEASE-1.9.1,srclibs=NoAnalytics@158a4a,\
-rm=libs/libGoogleAnalytics.jar,prebuild=\
-echo 'android.library.reference.1=$$NoAnalytics$$' >> project.properties && \
-mv androidannotations-2.5.jar libs/ && rm libs/androidannotations-2.5-api.jar
-Build Version:1.9.2,12,!can't tell if a release
+Build:1.9,10
+    commit=313f0c48
+    rm=libs/libGoogleAnalytics.jar
+    srclibs=NoAnalytics@158a4a
+    prebuild=echo 'android.library.reference.1=$$NoAnalytics$$' >> project.properties && \
+        mv androidannotations-2.5.jar libs/ && \
+        rm libs/androidannotations-2.5-api.jar
+
+Build:1.9.1,11
+    commit=RELEASE-1.9.1
+    rm=libs/libGoogleAnalytics.jar
+    srclibs=NoAnalytics@158a4a
+    prebuild=echo 'android.library.reference.1=$$NoAnalytics$$' >> project.properties && \
+        mv androidannotations-2.5.jar libs/ && \
+        rm libs/androidannotations-2.5-api.jar
+
+Build:1.9.5,15
+    commit=ac1ea46fee0f9e0
+    rm=libs/libGoogleAnalytics.jar
+    srclibs=1:NoAnalytics@d38ae535b543b
+    prebuild=mv androidannotations-2.5.jar libs/ && \
+        rm libs/androidannotations-2.5-api.jar
+
+Build:1.9.6,16
+    commit=build-16
+    rm=libs/libGoogleAnalytics.jar
+    srclibs=1:NoAnalytics@d38ae535b543b
+    prebuild=mv androidannotations-2.5.jar libs/ && \
+        rm libs/androidannotations-2.5-api.jar
 
 Auto Update Mode:None
-#Also on Google Play; release commits difficult to find
 Update Check Mode:RepoManifest
-Current Version:1.9.4
-Current Version Code:14
-
-No Source Since:1.9.3
+Current Version:1.9.6
+Current Version Code:16
 
diff --git a/metadata/com.mareksebera.simpledilbert.txt b/metadata/com.mareksebera.simpledilbert.txt
index a2d9a6d07e..116ba2f429 100644
--- a/metadata/com.mareksebera.simpledilbert.txt
+++ b/metadata/com.mareksebera.simpledilbert.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:Apache2
 Web Site:http://smarek.github.io/Simple-Dilbert
 Source Code:https://github.com/smarek/Simple-Dilbert
@@ -6,6 +6,7 @@ Issue Tracker:https://github.com/smarek/Simple-Dilbert/issues
 FlattrID:1134425
 Bitcoin:1FpGN3kcZ3GQsaJgBa8rxGRJjBjJavu78g
 
+Provides:com.mareksebera.dilbert
 Auto Name:Simple Dilbert
 Summary:Comic strip reader
 Description:
@@ -20,39 +21,51 @@ Description:
 Repo Type:git
 Repo:https://github.com/smarek/Simple-Dilbert
 
-Build Version:2.3,15,v2.3,extlib=android/android-support-v4.jar,\
-srclibs=ActionBarSherlock@4.3.1;ImageLoader@v1.8.5;PhotoView@05b1c2aae5985,\
-prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
-sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties
-Build Version:3.6,29,v3.6,\
-srclibs=ActionBarSherlock@4.3.1;ImageLoader@077a22f88;PhotoView@05b1c2aae5985,\
-extlibs=android/android-support-v4.jar,\
-update=.;libraries/FileExplorer,\
-prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
-         sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
-         sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@' \
-            libraries/FileExplorer/project.properties
-Build Version:3.7,30,v3.7,\
-srclibs=ActionBarSherlock@4.4.0;ImageLoader@077a22f88;PhotoView@05b1c2aae5985,\
-extlibs=android/android-support-v4.jar,\
-update=.;libraries/FileExplorer,\
-prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
-         sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
-         sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@' \
-            libraries/FileExplorer/project.properties
-Build Version:3.8,31,v3.8,submodules=yes,extlibs=android/android-support-v4.jar,\
-update=.;libraries/ActionBarSherlock/actionbarsherlock;libraries/Android-Universal-Image-Loader/library;libraries/FileExplorer;libraries/PhotoView/library,\
-prebuild=cp -f libs/android-support-v4.jar libraries/ActionBarSherlock/actionbarsherlock/libs/ && \
-rm -f libraries/Android-Universal-Image-Loader/downloads/*.apk
+Build:2.3,15
+    commit=v2.3
+    srclibs=ActionBarSherlock@4.3.1;ImageLoader@v1.8.5;PhotoView@05b1c2aae5985
+    prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
+        sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties
+    extlib=android/android-support-v4.jar
+
+Build:3.6,29
+    commit=v3.6
+    update=.;libraries/FileExplorer
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.3.1;ImageLoader@077a22f88;PhotoView@05b1c2aae5985
+    prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
+        sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
+        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@'             libraries/FileExplorer/project.properties
+
+Build:3.7,30
+    commit=v3.7
+    update=.;libraries/FileExplorer
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.4.0;ImageLoader@077a22f88;PhotoView@05b1c2aae5985
+    prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
+        sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
+        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@'             libraries/FileExplorer/project.properties
+
+Build:3.8,31
+    commit=v3.8
+    submodules=yes
+    update=.;libraries/ActionBarSherlock/actionbarsherlock;libraries/Android-Universal-Image-Loader/library;libraries/FileExplorer;libraries/PhotoView/library
+    extlibs=android/android-support-v4.jar
+    prebuild=cp -f libs/android-support-v4.jar libraries/ActionBarSherlock/actionbarsherlock/libs/ && \
+        rm -f libraries/Android-Universal-Image-Loader/downloads/*.apk
+
+Build:3.9,32
+    commit=v3.9
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:3.8
-Current Version Code:31
+Current Version:3.9
+Current Version Code:32
 
diff --git a/metadata/com.martinborjesson.o2xtouchlednotifications.txt b/metadata/com.martinborjesson.o2xtouchlednotifications.txt
index de4a5c9e4b..91279867f1 100644
--- a/metadata/com.martinborjesson.o2xtouchlednotifications.txt
+++ b/metadata/com.martinborjesson.o2xtouchlednotifications.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/mborjesson/LG-Optimus-2X-Black-Notifications
 Source Code:https://github.com/mborjesson/LG-Optimus-2X-Black-Notifications
diff --git a/metadata/com.matburt.mobileorg.txt b/metadata/com.matburt.mobileorg.txt
index fc11131fcd..52c71fcd43 100644
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPL
 Web Site:https://github.com/matburt/mobileorg-android/wiki
 Source Code:https://github.com/matburt/mobileorg-android
diff --git a/metadata/com.matoski.adbm.txt b/metadata/com.matoski.adbm.txt
new file mode 100644
index 0000000000..9bde29cd1e
--- /dev/null
+++ b/metadata/com.matoski.adbm.txt
@@ -0,0 +1,42 @@
+Categories:Development
+License:Apache2
+Web Site:
+Source Code:https://github.com/ilijamt/android-adbm
+Issue Tracker:https://github.com/ilijamt/android-adbm/issues
+
+Auto Name:ADB Manager
+Summary:Manage Android Debug Bridge
+Description:
+* Easy control and access details from notification bar
+* Auto connect on saved WiFi networks
+* Auto start on boot, you can select if you want to or not from the preferences screen
+* Automatically switch between USB and NETWORK when you disconnect/connect from/to WiFi
+* Configurable service management
+* Different color coded icons depending on the state of the ADB
+* Keep screen on while the service is running
+* Wake the screen when new package is installed
+* You can toggle the ADB state by touching the image in the notification bar
+
+[https://raw.github.com/ilijamt/android-adbm/master/changelog.md Changelog]
+
+'''Requires root'''
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/ilijamt/android-adbm.git
+
+Build:1.0.1,16
+    commit=1.0.1
+    init=rm build.xml
+
+Build:1.0.5,18
+    commit=1.0.5
+    update=force
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.5
+Current Version Code:18
+
diff --git a/metadata/com.matteopacini.katana.txt b/metadata/com.matteopacini.katana.txt
new file mode 100644
index 0000000000..94e58208a8
--- /dev/null
+++ b/metadata/com.matteopacini.katana.txt
@@ -0,0 +1,26 @@
+AntiFeatures:Tracking
+Categories:System
+License:GPLv3
+Web Site:https://github.com/Zi0P4tch0/Katana
+Source Code:https://github.com/Zi0P4tch0/Katana
+Issue Tracker:https://github.com/Zi0P4tch0/Katana/issues
+
+Auto Name:Katana
+Summary:Split files via a file manager
+Description:
+Crash reports ar sent without interaction.
+.
+
+Repo Type:git
+Repo:https://github.com/Zi0P4tch0/Katana.git
+
+Build:1.3.2,21
+    commit=v1.3.2
+    target=android-18
+    buildjni=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3.2
+Current Version Code:21
+
diff --git a/metadata/com.max2idea.android.fwknop.txt b/metadata/com.max2idea.android.fwknop.txt
index df63aef335..099556f8c1 100644
--- a/metadata/com.max2idea.android.fwknop.txt
+++ b/metadata/com.max2idea.android.fwknop.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:http://www.cipherdyne.org
 Source Code:http://www.cipherdyne.org/cgi-bin/gitweb.cgi
diff --git a/metadata/com.maxfierke.sandwichroulette.txt b/metadata/com.maxfierke.sandwichroulette.txt
index 0186346d55..f52b5e6433 100644
--- a/metadata/com.maxfierke.sandwichroulette.txt
+++ b/metadata/com.maxfierke.sandwichroulette.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:
 Source Code:https://github.com/maxfierke/sandwichroulette
@@ -6,7 +6,7 @@ Issue Tracker:https://github.com/maxfierke/sandwichroulette/issues
 Donate:http://forum.xda-developers.com/donatetome.php?u=1949659
 
 Auto Name:SandwichRoulette
-Summary:Not sure what you want?
+Summary:Random selection of ingredients
 Description:
 SandwichRoulette is an application designed for the indecisive. Like many
 people, my lunch has been delayed because of my inability to decide on what
diff --git a/metadata/com.mehmetakiftutuncu.eshotroid.txt b/metadata/com.mehmetakiftutuncu.eshotroid.txt
new file mode 100644
index 0000000000..b03f6bdd05
--- /dev/null
+++ b/metadata/com.mehmetakiftutuncu.eshotroid.txt
@@ -0,0 +1,42 @@
+Categories:Navigation
+License:GPLv3
+Web Site:
+Source Code:https://github.com/mehmetakiftutuncu/eshotroid
+Issue Tracker:https://github.com/mehmetakiftutuncu/eshotroid/issues
+
+Auto Name:Eshotroid
+Summary:Bus times in Turkey
+Description:
+* See buses in İzmir, their locations and their times.
+* Search buses by their numbers and locations.
+* Mark your favorite buses for easy access.
+* See the remaining time for a bus by touching it's time.
+* You can update the bus list and bus times whenever you want.
+* You can query the balance of your Kent Kart.
+* Turkish or English
+
+All the information about buses are downloaded from 
+http://mobil.eshot.gov.tr and all the information about 
+Kent Kart are downloaded from http://m.kentkart.com.
+.
+
+Repo Type:git
+Repo:https://github.com/mehmetakiftutuncu/eshotroid.git
+
+Build:2.0,3
+    commit=975ab
+    subdir=Eshotroid
+
+Build:2.1,4
+    commit=v2.1
+    subdir=Eshotroid
+
+Build:2.3,6
+    commit=v2.3
+    subdir=Eshotroid
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:2.3
+Current Version Code:6
+
diff --git a/metadata/com.mendhak.gpslogger.txt b/metadata/com.mendhak.gpslogger.txt
index 1f7a7b5bdf..89fae313e7 100644
--- a/metadata/com.mendhak.gpslogger.txt
+++ b/metadata/com.mendhak.gpslogger.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://github.com/mendhak/gpslogger
 Source Code:https://github.com/mendhak/gpslogger
diff --git a/metadata/com.menny.android.anysoftkeyboard.txt b/metadata/com.menny.android.anysoftkeyboard.txt
index ce3729b336..d3ebf8e881 100644
--- a/metadata/com.menny.android.anysoftkeyboard.txt
+++ b/metadata/com.menny.android.anysoftkeyboard.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/softkeyboard/
 Source Code:https://github.com/AnySoftKeyboard/AnySoftKeyboard
@@ -28,56 +28,87 @@ dictionaries. For more info see the f-droid.org
 Repo Type:git
 Repo:https://github.com/AnySoftKeyboard/AnySoftKeyboard.git
 
-Build Version:20120528,74,d6c2f7448,buildjni=yes,srclibs=AnySoftKeyboard-API@78768bc479,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-Build Version:20120814-eye-candy,76,! doesn't build,buildjni=yes,srclibs=AnySoftKeyboard-API@78768bc479,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
-Build Version:20130106-eye-candy,85,a7723e1db5,srclibs=AnySoftKeyboard-API@b21d8907,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict && \
-wget http://softkeyboard.googlecode.com/svn-history/r544/trunk/project/dict_creation/makedict_Linux && \
-wget https://github.com/AnySoftKeyboard/AnySoftKeyboardTools/blob/master/makedict/makedict.jar?raw=true \
--O makedict.jar && chmod +x makedict_Linux && ./makedict_Linux dict/words.xml,buildjni=yes
-Build Version:20130222-skinny-eye-candy,95,50daad0b0a,\
-srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
-rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
-StoreStuff/ res/raw/words_1.dict,buildjni=yes
-Build Version:20130501-skinny-eye-candy-post-birthday,98,6f51b8a9d,\
-srclibs=AnySoftKeyboard-API@2c864957;AnySoftKeyboardTools@73e9a09496,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
-rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
-StoreStuff/ res/raw/words_1.dict,buildjni=yes
-Build Version:20130528,102,72fd519,\
-srclibs=AnySoftKeyboard-API@8d8a958e17;AnySoftKeyboardTools@73e9a09496,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
-rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
-StoreStuff/ res/raw/words_1.dict,buildjni=yes
-Build Version:20130709,106,f1ba2de,\
-srclibs=AnySoftKeyboard-API@30851236d7;AnySoftKeyboardTools@73e9a09496,\
-prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-         sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
-         rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
-         StoreStuff/ res/raw/words_1.dict,\
-buildjni=yes
-Build Version:20130807,107,!not published
+Build:20120528,74
+    commit=d6c2f7448
+    srclibs=AnySoftKeyboard-API@78768bc479
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
+    buildjni=yes
+
+Build:20120814-eye-candy,76
+    disable=doesn't build
+    commit=unknown - see disabled
+    srclibs=AnySoftKeyboard-API@78768bc479
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties
+    buildjni=yes
+
+Build:20130106-eye-candy,85
+    commit=a7723e1db5
+    srclibs=AnySoftKeyboard-API@b21d8907
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict && \
+        wget http://softkeyboard.googlecode.com/svn-history/r544/trunk/project/dict_creation/makedict_Linux && \
+        wget https://github.com/AnySoftKeyboard/AnySoftKeyboardTools/blob/master/makedict/makedict.jar?raw=true -O makedict.jar && \
+        chmod +x makedict_Linux && \
+        ./makedict_Linux dict/words.xml
+    buildjni=yes
+
+Build:20130222-skinny-eye-candy,95
+    commit=50daad0b0a
+    srclibs=AnySoftKeyboard-API@b21d8907;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
+
+Build:20130501-skinny-eye-candy-post-birthday,98
+    commit=6f51b8a9d
+    srclibs=AnySoftKeyboard-API@2c864957;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
+
+Build:20130528,102
+    commit=72fd519
+    srclibs=AnySoftKeyboard-API@8d8a958e17;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
+
+Build:20130709,106
+    commit=f1ba2de
+    srclibs=AnySoftKeyboard-API@30851236d7;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
+
+Build:20130807,107
+    disable=not published
+    commit=unknown - see disabled
+
 #Note that there is a 110 version for Android 1.5, but the F-Droid client no
 #longer supports that anyway, so there seems little point in building it
-Build Version:20130919,111,2a68963f,\
-srclibs=AnySoftKeyboard-API@30851236d7;AnySoftKeyboardTools@73e9a09496,\
-prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
-         sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
-         rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
-         StoreStuff/ res/raw/words_1.dict,\
-buildjni=yes
+Build:20130919,111
+    commit=2a68963f
+    srclibs=AnySoftKeyboard-API@30851236d7;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
+
+Build:20131101,114
+    disable=no longer uses ant, prebuilts
+    commit=82538d456f8
+    srclibs=AnySoftKeyboard-API@08b452ff4;AnySoftKeyboardTools@73e9a09496
+    prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+        sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+        rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore StoreStuff/ res/raw/words_1.dict
+    buildjni=yes
 
-# Tags are at menny/AnySoftKeyboard
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:RepoManifest
-Current Version:20130919
-Current Version Code:111
+Current Version:1.2.
+Current Version Code:121
 
diff --git a/metadata/com.midisheetmusic.txt b/metadata/com.midisheetmusic.txt
index 31c538236c..a02181c6cb 100644
--- a/metadata/com.midisheetmusic.txt
+++ b/metadata/com.midisheetmusic.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2
 Web Site:http://sourceforge.net/projects/midisheetmusic
 Source Code:http://sourceforge.net/p/midisheetmusic/source
@@ -26,8 +26,7 @@ Repo:git://git.code.sf.net/p/midisheetmusic/source
 Build Version:2.5.1,8,6d9e80ad1f6182,subdir=android
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.5.1
 Current Version Code:8
 
diff --git a/metadata/com.miracleas.bitcoin_spinner.txt b/metadata/com.miracleas.bitcoin_spinner.txt
index cd314628cc..355c17d634 100644
--- a/metadata/com.miracleas.bitcoin_spinner.txt
+++ b/metadata/com.miracleas.bitcoin_spinner.txt
@@ -1,54 +1,66 @@
-Antifeatures:NonFreeAdd
-Category:Office
+AntiFeatures:NonFreeAdd
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/bitcoinspinner/
-Source Code:http://code.google.com/p/bitcoinspinner/source/list
-Issue Tracker:http://code.google.com/p/bitcoinspinner/issues/list
+Source Code:http://code.google.com/p/bitcoinspinner/source
+Issue Tracker:http://code.google.com/p/bitcoinspinner/issues
 Bitcoin:14VWYvbHd4R7oTFS8kEfoWZFTzbedDgwKg
 
 Auto Name:BitcoinSpinner
-Summary:Lightweight bitcoin wallet
+Summary:Abandoned bitcoin wallet
 Description:
-'''0.8.3b contains an important 
-[http://bitcoin.org/en/alert/2013-08-11-android security fix].''' 
-You will need to transfer your coins to another wallet (e.g.
-latest version of [[de.schildbach.wallet]]) and uninstall this.
-The coins can be moved back to Bitcoinspinner after the 0.8.3b is installed.
+'''Retained for information only - DO NOT USE'''
 
-Send and receive Bitcoins using QR codes. Share your Bitcoin address using
-Gmail, Twitter and more. Backup/restore wallet using QR codes. The blockchain
-is not downloaded, but is kept track of by a remote server. All your Bitcoins
-are protected using private keys stored on your device using app private storage
-. BitcoinSpinner is NOT an on-line Bitcoin Bank. Nobody can run away with your
-Bitcoins. It is implemented on top of the BCCAPI, which means that all the heavy
-lifting associated with managing the block chain is hosted by a server. The server
-side is not in any position to spend your Bitcoins, as all private keys are stored
- in your device. This beta software so don't put the life savings in there.
-
-Anti-features: The app recommends that you use another wallet app 
-(its 'successor') but that is published under a non-free license.
+The developer of this bitcoin wallet has replaced it with a new one which
+has a non-Free license. Don't use this wallet - it is no longer maintained.
 .
 
 Repo Type:git-svn
 Repo:http://bitcoinspinner.googlecode.com/svn/trunk/
 
-Build Version:0.7.1b,32,62,subdir=BitcoinSpinner,update=.;../BitcoinSpinnerLib
-Build Version:0.7.2b,33,68,subdir=BitcoinSpinner,update=.;../BitcoinSpinnerLib
-Build Version:0.7.3b,34,74,subdir=BitcoinSpinner,update=.;../BitcoinSpinnerLib
-Build Version:0.8.2b,37,86,subdir=BitcoinSpinner,target=android-10,prebuild=\
-ant bitlib-jar -f ../bitlib/build.xml && \
-rm ../bccapi/src/com/bccapi/ng/example/SimpleClient.java && mkdir -p libs/ && \
-ant all -f ../bccapi/build.xml && mv ../bccapi/out/bccapi.jar libs/
+Build:0.7.1b,32
+    commit=62
+    subdir=BitcoinSpinner
+    update=.;../BitcoinSpinnerLib
 
-Build Version:0.8.3b,38,89,subdir=BitcoinSpinner,\
-target=android-10,\
-prebuild=mkdir -p src/com/bccapi/ && \
-         mv ../bitlib/src/com/bccapi/bitlib src/com/bccapi/ && \
-         mv ../bccapi/src/com/bccapi/* src/com/bccapi
+Build:0.7.2b,33
+    commit=68
+    subdir=BitcoinSpinner
+    update=.;../BitcoinSpinnerLib
+
+Build:0.7.3b,34
+    commit=74
+    subdir=BitcoinSpinner
+    update=.;../BitcoinSpinnerLib
+
+Build:0.8.2b,37
+    commit=86
+    subdir=BitcoinSpinner
+    target=android-10
+    prebuild=ant bitlib-jar -f ../bitlib/build.xml && \
+        rm ../bccapi/src/com/bccapi/ng/example/SimpleClient.java && \
+        mkdir -p libs/ && \
+        ant all -f ../bccapi/build.xml && \
+        mv ../bccapi/out/bccapi.jar libs/
+
+Build:0.8.3b,38
+    commit=89
+    subdir=BitcoinSpinner
+    target=android-10
+    prebuild=mkdir -p src/com/bccapi/ && \
+        mv ../bitlib/src/com/bccapi/bitlib src/com/bccapi/ && \
+        mv ../bccapi/src/com/bccapi/* src/com/bccapi
+
+Build:0.8.4b,39
+    commit=91
+    subdir=BitcoinSpinner
+    target=android-10
+    prebuild=mkdir -p src/com/bccapi/ && \
+        mv ../bitlib/src/com/bccapi/bitlib src/com/bccapi/ && \
+        mv ../bccapi/src/com/bccapi/* src/com/bccapi
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.8.3b
-Current Version Code:38
+Update Check Mode:Static
+Current Version:0.8.4b
+Current Version Code:39
 
diff --git a/metadata/com.mirasmithy.epochlauncher.txt b/metadata/com.mirasmithy.epochlauncher.txt
new file mode 100644
index 0000000000..afeac92457
--- /dev/null
+++ b/metadata/com.mirasmithy.epochlauncher.txt
@@ -0,0 +1,25 @@
+Categories:System
+License:GPLv3
+Web Site:
+Source Code:https://github.com/mirasmithy/epochlauncher
+Issue Tracker:https://github.com/mirasmithy/epochlauncher/issues
+
+Auto Name:Epoch Launcher
+Summary:Homescreen and launcher
+Description:
+Launcher in the style of Sword Art Online.
+Allows categories via long-press, custom fonts, black/white themes.
+.
+
+Repo Type:git
+Repo:https://github.com/mirasmithy/epochlauncher.git
+
+Build:1.1,2
+    commit=v1.1
+    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.mkf.droidsat.txt b/metadata/com.mkf.droidsat.txt
index c427403e0d..4648163b61 100644
--- a/metadata/com.mkf.droidsat.txt
+++ b/metadata/com.mkf.droidsat.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://code.google.com/p/droidsat
-Source Code:https://code.google.com/p/droidsat/source/list
-Issue Tracker:https://code.google.com/p/droidsat/issues/list
+Source Code:https://code.google.com/p/droidsat/source
+Issue Tracker:https://code.google.com/p/droidsat/issues
 
 Auto Name:DroidSat
 Summary:Satellite viewer
@@ -22,8 +22,7 @@ Build Version:2.47,22,3ab7f2e3d597,target=android-10
 Build Version:2.51,24,263c892ea671,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.51
 Current Version Code:24
 
diff --git a/metadata/com.mobilepearls.memory.txt b/metadata/com.mobilepearls.memory.txt
new file mode 100644
index 0000000000..984df7d8b5
--- /dev/null
+++ b/metadata/com.mobilepearls.memory.txt
@@ -0,0 +1,23 @@
+Disabled:No license specified
+Categories:Games
+License:Unknown
+Web Site:https://github.com/mobilepearls/com.mobilepearls.memory
+Source Code:https://github.com/mobilepearls/com.mobilepearls.memory
+Issue Tracker:https://github.com/mobilepearls/com.mobilepearls.memory/issues
+
+Summary:Simple Memory Game
+Description:
+A simple memory game.
+.
+
+Repo Type:git
+Repo:https://github.com/mobilepearls/com.mobilepearls.memory.git
+
+Build:1.5,6
+    commit=24bd57bdbe3608
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:6
+
diff --git a/metadata/com.mobilepearls.sokoban.txt b/metadata/com.mobilepearls.sokoban.txt
index 679b3e18e8..b624a16cab 100644
--- a/metadata/com.mobilepearls.sokoban.txt
+++ b/metadata/com.mobilepearls.sokoban.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://mobilepearls.com
 Source Code:https://github.com/mobilepearls/com.mobilepearls.sokoban
@@ -13,11 +13,11 @@ Push the jewels in to the green zones, but don't corner yourself!
 Repo Type:git
 Repo:https://github.com/mobilepearls/com.mobilepearls.sokoban.git
 
-Build Version:1.11,12,48e1976f9d9881adb70e
+Build:1.11,12
+    commit=48e1976f9d9881adb70e
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.11
 Current Version Code:12
 
diff --git a/metadata/com.mobiperf.txt b/metadata/com.mobiperf.txt
new file mode 100644
index 0000000000..86c9da1308
--- /dev/null
+++ b/metadata/com.mobiperf.txt
@@ -0,0 +1,41 @@
+Category:Development
+License:Apache2
+Web Site:http://mobiperf.com
+Source Code:https://github.com/Mobiperf/MobiPerf
+Issue Tracker:https://github.com/Mobiperf/MobiPerf/issues
+
+Auto Name:MobiPerf
+Summary:Mobile network measurements
+Description:
+The app uploads 'anonymised' data to the Mobiperf server run by the 
+developers.
+The server is based on free software but the app would need re-coding
+to work with a different server.
+You can view the data collected that has been collected within the app.
+
+The Android app periodically checks in with the measurement server,
+running on Google App Engine, 
+which sends it a list of measurement tasks to perform. Measurement tasks
+include ping, traceroute, HTTP GET, DNS lookup, and TCP Throughput. Each 
+task has an associated set of measurement parameters (e.g., which host 
+to ping), and a schedule (periodicity at which to take the measurement).
+
+The device runs the measurements in the background, and uploads the
+measurement results on its next checkin cycle. By default, devices
+check in with the server every hour. In order to avoid draining the
+battery, the app will not take any measurements if the battery is
+below a given threshold (80% by default).
+.
+
+Repo Type:git
+Repo:https://github.com/Mobiperf/MobiPerf.git
+
+Build Version:v2.1,101,469323682e,subdir=android,\
+target=android-10,\
+rm=android/tests
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:v2.1
+Current Version Code:101
+
diff --git a/metadata/com.mod.android.widget.fbcw.txt b/metadata/com.mod.android.widget.fbcw.txt
new file mode 100644
index 0000000000..aeec53da00
--- /dev/null
+++ b/metadata/com.mod.android.widget.fbcw.txt
@@ -0,0 +1,28 @@
+Categories:System
+License:Apache2
+Web Site:
+Source Code:https://github.com/marin-liovic/Fast-Brightness-Control-Widget
+Issue Tracker:https://github.com/marin-liovic/Fast-Brightness-Control-Widget/issues
+
+Auto Name:Fast Brightness Control Widget
+Summary:Simple brightness widget
+Description:
+There are five possible states which are configurable via the launcher
+.
+
+Repo Type:git
+Repo:https://github.com/marin-liovic/Fast-Brightness-Control-Widget.git
+
+Build:1.1,2
+    commit=99f0d
+    target=android-16
+
+Build:1.2,3
+    commit=203698eb881bf5c90
+    target=android-16
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3
+
diff --git a/metadata/com.mohammadag.beamfile.txt b/metadata/com.mohammadag.beamfile.txt
index 9c3f551077..5d93ac9834 100644
--- a/metadata/com.mohammadag.beamfile.txt
+++ b/metadata/com.mohammadag.beamfile.txt
@@ -1,4 +1,5 @@
-Category:System
+AntiFeatures:UpstreamNonFree
+Categories:System
 License:GPLv3
 Web Site:http://forum.xda-developers.com/member.php?u=2011359
 Source Code:https://github.com/MohammadAG/android-file-beam
@@ -17,22 +18,47 @@ then tap two devices together, then tap the screen again. Only the
 sender needs to have the app installed, but both devices need NFC.
 The actual file transfer goes over WiFi.
 
-Google Admob was removed before building.
+A proprietary Google Admob binary was removed before building.
 .
 
 Repo Type:git
 Repo:https://github.com/MohammadAG/android-file-beam.git
 
-Build Version:1.0,1,b1cb5f3b59,\
-srclibs=MobAdMob@2d5736,prebuild=rm libs/GoogleAdMobAdsSdk*.jar && \
-echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
-Build Version:1.1,2,d68f2df76881ec5216a3482c19a70,srclibs=MobAdMob@2d5736,prebuild=\
-rm libs/GoogleAdMobAdsSdk*.jar && echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
-Build Version:1.2,3,ae9cec4e77,srclibs=MobAdMob@2d5736,prebuild=\
-rm libs/GoogleAdMobAdsSdk*.jar && echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
+Build:1.0,1
+    commit=b1cb5f3b59
+    srclibs=MobAdMob@2d5736
+    prebuild=rm libs/GoogleAdMobAdsSdk*.jar && \
+        echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
+
+Build:1.1,2
+    commit=d68f2df76881ec5216a3482c19a70
+    srclibs=MobAdMob@2d5736
+    prebuild=rm libs/GoogleAdMobAdsSdk*.jar && \
+        echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
+
+Build:1.2,3
+    commit=ae9cec4e77
+    srclibs=MobAdMob@2d5736
+    prebuild=rm libs/GoogleAdMobAdsSdk*.jar && \
+        echo "source.dir=src;$$MobAdMob$$/src" > ant.properties
+
+Build:1.3,4
+    disable=build crashes (dexer)
+    commit=5c211fc5ab
+    srclibs=MobAdMob@2d5736;NineOldAndroids@2.4.0;ShowcaseView@4.0
+    prebuild=rm libs/GoogleAdMobAdsSdk*.jar && \
+        echo "source.dir=src;$$MobAdMob$$/src" > ant.properties && \
+	echo "android.library.reference.1=$$ShowcaseView$$" >> project.properties && \
+	cp libs/android-support-v4.jar $$ShowcaseView$$/libs/
+
+Maintainer Notes:
+The 1.3 build crashing is a strange thing, but I'm not prepared to spend much
+time investigating it when upstream is non-free, so it's just disabled for now,
+and maybe it won't crash with the next release.
+.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.2
-Current Version Code:3
+Current Version:1.3
+Current Version Code:4
 
diff --git a/metadata/com.monead.games.android.sequence.txt b/metadata/com.monead.games.android.sequence.txt
index a4067b9c95..7a399a6f83 100644
--- a/metadata/com.monead.games.android.sequence.txt
+++ b/metadata/com.monead.games.android.sequence.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:AGPLv3+
 Web Site:https://github.com/DaveRead/SequenceHunt
 Source Code:https://github.com/DaveRead/SequenceHunt
diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt
index f9ce4ed9cf..2455e06745 100644
--- a/metadata/com.morphoss.acal.txt
+++ b/metadata/com.morphoss.acal.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://acal.me
 Source Code:http://gitorious.org/acal/acal
diff --git a/metadata/com.mp3tunes.android.player.txt b/metadata/com.mp3tunes.android.player.txt
index fd5fbd77e8..2875b32257 100644
--- a/metadata/com.mp3tunes.android.player.txt
+++ b/metadata/com.mp3tunes.android.player.txt
@@ -1,9 +1,9 @@
 Disabled:Service unavailable
 AntiFeatures:NonFreeNet
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3+
 Web Site:http://code.google.com/p/mp3tunes/
-Source Code:http://code.google.com/p/mp3tunes/source/browse/
+Source Code:http://code.google.com/p/mp3tunes/source
 Issue Tracker:http://androidmp3.uservoice.com/
 
 Auto Name:MP3tunes
@@ -22,11 +22,9 @@ Repo Type:hg
 Repo:https://mp3tunes.googlecode.com/hg/
 
 Build Version:3.7,89,ba4550305733,target=android-4,fixapos=yes
-Build Version:5.1,92,!No source in repo
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:5.1
-Current Version Code:92
+Update Check Mode:RepoManifest
+Current Version:3.7
+Current Version Code:89
 
diff --git a/metadata/com.mridang.cellinfo.txt b/metadata/com.mridang.cellinfo.txt
index 63c3b91080..a8aca594b7 100644
--- a/metadata/com.mridang.cellinfo.txt
+++ b/metadata/com.mridang.cellinfo.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/mridang/dashclock-cellinfo
@@ -25,7 +25,7 @@ srclibs=DashClock@v1.2,prebuild=cp -r $$DashClock$$/api/src/com src/
 # Not updating - newer versions depend on Google Play for full
 # functionality - https://github.com/mridang/dashclock-cellinfo/commit/975a35cd9
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:0.7
-Current Version Code:7
+Update Check Mode:Static
+Current Version:1.0
+Current Version Code:3
 
diff --git a/metadata/com.mridang.wifiinfo.txt b/metadata/com.mridang.wifiinfo.txt
index 4d91873573..d8fbdef0b5 100644
--- a/metadata/com.mridang.wifiinfo.txt
+++ b/metadata/com.mridang.wifiinfo.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/mridang/dashclock-wifiinfo
diff --git a/metadata/com.mykola.lexinproject.txt b/metadata/com.mykola.lexinproject.txt
new file mode 100644
index 0000000000..29c938b632
--- /dev/null
+++ b/metadata/com.mykola.lexinproject.txt
@@ -0,0 +1,28 @@
+Categories:Office
+License:Apache2
+Web Site:
+Source Code:https://github.com/cmykola/Lexin
+Issue Tracker:https://github.com/cmykola/Lexin/issues
+
+Auto Name:LexinProject
+Summary:Swedish dictionary for learners	
+Description:
+Currently supported:
+albanska; amhariska; arabiska; azerbajdzjanska; bosniska; engelskt; finska;
+grekiska; kroatiska; nordkurdiska; pashto; persiska; ryska; serbiska (latinskt);
+serbiska (kyrilliskt); somaliska; spanska; sydkurdiska; turkiska.
+.
+
+Repo Type:git
+Repo:https://github.com/cmykola/Lexin.git
+
+Build:1.5,6
+    commit=efb7ade05b24ab
+    srclibs=1:ActionBarSherlock@4.2.0
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:6
+
diff --git a/metadata/com.myopicmobile.textwarrior.android.txt b/metadata/com.myopicmobile.textwarrior.android.txt
index 71eaa5a4a1..acdd8570e1 100644
--- a/metadata/com.myopicmobile.textwarrior.android.txt
+++ b/metadata/com.myopicmobile.textwarrior.android.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://sourceforge.net/projects/textwarrior/
 Source Code:http://textwarrior.svn.sourceforge.net/
diff --git a/metadata/com.naholyr.android.horairessncf.txt b/metadata/com.naholyr.android.horairessncf.txt
index 1b58b69b96..02825d5652 100644
--- a/metadata/com.naholyr.android.horairessncf.txt
+++ b/metadata/com.naholyr.android.horairessncf.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:NewBSD
 Web Site:http://code.google.com/p/horaires-ter-sncf
-Source Code:http://code.google.com/p/horaires-ter-sncf/source/checkout
-Issue Tracker:http://code.google.com/p/horaires-ter-sncf/issues/list
+Source Code:http://code.google.com/p/horaires-ter-sncf/source
+Issue Tracker:http://code.google.com/p/horaires-ter-sncf/issues
 
 Auto Name:Horaires TER SNCF
 Summary:Info for regional trains in France
diff --git a/metadata/com.namelessdev.mpdroid.txt b/metadata/com.namelessdev.mpdroid.txt
index f8a9fbff87..328aacede3 100644
--- a/metadata/com.namelessdev.mpdroid.txt
+++ b/metadata/com.namelessdev.mpdroid.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:https://github.com/abarisain/dmix
 Source Code:https://github.com/abarisain/dmix
@@ -13,23 +13,68 @@ An MPD client which supports streaming. Can fetch cover art from last.fm.
 Repo Type:git
 Repo:https://github.com/abarisain/dmix.git
 
-Build Version:0.7,18,e3bcfaa4e4,subdir=MPDroid,prebuild=mkdir libs/ && \
-cd ../JMPDComm/ && ant && cp JMPDComm.jar ../MPDroid/libs/ && \
-cd ../MPDroid && cp -r ../lastfm-java/src/net/ src/
-Build Version:1.0,20,63a363a2ccc13232f4d80f5f857ab19b40fb5469,subdir=MPDroid,target=android-13,prebuild=mv lib/ libs/ && \
-cd ../JMPDComm/ && ant && cp JMPDComm.jar ../MPDroid/libs/ && \
-cd ../MPDroid && cp -r ../lastfm-java/src/net/ src/
-Build Version:1.02,24,e244b51aaa,subdir=MPDroid,update=.;../ActionBarSherlock
-Build Version:1.03.1,26,8758a34,subdir=MPDroid,update=.;../ActionBarSherlock
-Build Version:1.05,30,5438917,subdir=MPDroid,update=.;../ActionBarSherlock;../JMPDComm
-Build Version:1.06,31,!9508bb7f79,subdir=MPDroid,update=.;../ActionBarSherlock;\
-../JMPDComm,init=rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
-Build Version:1.06 beta 2,33,109cfe14,subdir=MPDroid,update=.;../ActionBarSherlock;\
-../JMPDComm,init=rm -rf Screenshots/ Website/ icons/ 
+Build:0.7,18
+    commit=e3bcfaa4e4
+    subdir=MPDroid
+    prebuild=mkdir libs/ && \
+        cd ../JMPDComm/ && \
+        ant && \
+        cp JMPDComm.jar ../MPDroid/libs/ && \
+        cd ../MPDroid && \
+        cp -r ../lastfm-java/src/net/ src/
+
+Build:1.0,20
+    commit=63a363a2ccc13232f4d80f5f857ab19b40fb5469
+    subdir=MPDroid
+    target=android-13
+    prebuild=mv lib/ libs/ && \
+        cd ../JMPDComm/ && \
+        ant && \
+        cp JMPDComm.jar ../MPDroid/libs/ && \
+        cd ../MPDroid && \
+        cp -r ../lastfm-java/src/net/ src/
+
+Build:1.02,24
+    commit=e244b51aaa
+    subdir=MPDroid
+    update=.;../ActionBarSherlock
+
+Build:1.03.1,26
+    commit=8758a34
+    subdir=MPDroid
+    update=.;../ActionBarSherlock
+
+Build:1.05,30
+    disable=failing
+    commit=5438917
+    subdir=MPDroid
+    update=.;../ActionBarSherlock;../JMPDComm
+
+Build:1.06,31
+    disable=9508bb7f79
+    commit=unknown - see disabled
+    subdir=MPDroid
+    init=rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
+    update=.;../ActionBarSherlock;../JMPDComm
+
+Build:1.06 beta 2,33
+    commit=109cfe14
+    subdir=MPDroid
+    init=rm -rf Screenshots/ Website/ icons/ 
+    update=.;../ActionBarSherlock;../JMPDComm
+
+Build:1.06 Beta 7,38
+    commit=1_06_b7
+    subdir=MPDroid
+    init=rm -rf Screenshots/ Website/ icons/ 
+
+Build:1.06,40
+    commit=1_06_final
+    subdir=MPDroid
+    init=rm -rf Screenshots/ Website/ icons/ 
 
 Auto Update Mode:None
-# Device-variable and publishes betas on Market
 Update Check Mode:Tags
-Current Version:1.05
-Current Version Code:30
+Current Version:1.07 Beta 1
+Current Version Code:41
 
diff --git a/metadata/com.nanoconverter.zlab.txt b/metadata/com.nanoconverter.zlab.txt
index d5426f68ff..c013500108 100644
--- a/metadata/com.nanoconverter.zlab.txt
+++ b/metadata/com.nanoconverter.zlab.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:WTFPL
 Web Site:http://blog.zorg.tk/nanoconverter/
 Source Code:https://github.com/ZorgeR/nanoConverter
diff --git a/metadata/com.nauj27.android.colorpicker.txt b/metadata/com.nauj27.android.colorpicker.txt
index b1404fa926..09debf3e9c 100644
--- a/metadata/com.nauj27.android.colorpicker.txt
+++ b/metadata/com.nauj27.android.colorpicker.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/colorpicker
-Source Code:http://code.google.com/p/colorpicker/source/checkout
-Issue Tracker:http://code.google.com/p/colorpicker/issues/list
+Source Code:http://code.google.com/p/colorpicker/source
+Issue Tracker:http://code.google.com/p/colorpicker/issues
 
 Auto Name:Color Picker
 Summary:Color Picker
@@ -18,12 +18,12 @@ Repo:https://code.google.com/p/colorpicker/
 
 Build Version:2.2,20120308,cf69f4c4098e,target=android-15
 Build Version:3.0,20121130,05adc24fa3ae,target=android-15
+Build:3.1,20130326
+    commit=ed34e2835efa
+    target=android-17
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:3.1
 Current Version Code:20130326
 
-No Source Since:3.1
-
diff --git a/metadata/com.nephoapp.anarxiv.txt b/metadata/com.nephoapp.anarxiv.txt
index a8e36fdbad..17dcfbef04 100644
--- a/metadata/com.nephoapp.anarxiv.txt
+++ b/metadata/com.nephoapp.anarxiv.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/nephoapp/anarxiv
 Source Code:https://github.com/nephoapp/anarxiv
diff --git a/metadata/com.nesswit.galbijjimsearcher.txt b/metadata/com.nesswit.galbijjimsearcher.txt
new file mode 100644
index 0000000000..9136e70fe1
--- /dev/null
+++ b/metadata/com.nesswit.galbijjimsearcher.txt
@@ -0,0 +1,28 @@
+Categories:Multimedia
+License:Apache2
+Web Site:
+Source Code:https://github.com/rishubil/GalbijjimSearcher
+Issue Tracker:https://github.com/rishubil/GalbijjimSearcher/issues
+
+Auto Name:Galbijjim Searcher
+Summary:Search images from the web
+Description:
+The searches go via a korean website.
+.
+
+Repo Type:git
+Repo:https://github.com/rishubil/GalbijjimSearcher.git
+
+Build:1.2.1.0,7
+    commit=7d796
+    subdir=GalbijjimSearcher
+    srclibs=2:PullToRefresh@v2.1.1;5:ProgressFragment@1.4.0
+    prebuild=cp ../lib-actionbarsherlock/libs/android-support-v4.jar $$ProgressFragment$$/libs/ && \
+        mv src/com/nesswit/galbijjimsearcher/DeviceData.java v.java && \
+        perl -CD -pe 'tr/\x{feff}//d' v.java > src/com/nesswit/galbijjimsearcher/DeviceData.java
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.2.1.0
+Current Version Code:7
+
diff --git a/metadata/com.netthreads.android.noiz2.txt b/metadata/com.netthreads.android.noiz2.txt
index 615dd60079..17df3ca5f4 100644
--- a/metadata/com.netthreads.android.noiz2.txt
+++ b/metadata/com.netthreads.android.noiz2.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:http://code.google.com/p/noiz2-droid/
-Source Code:http://code.google.com/p/noiz2-droid/source/checkout
-Issue Tracker:http://code.google.com/p/noiz2-droid/issues/list
+Source Code:http://code.google.com/p/noiz2-droid/source
+Issue Tracker:http://code.google.com/p/noiz2-droid/issues
 
 Auto Name:Noiz2
 Summary:Port of the game Noiz2
@@ -22,8 +22,7 @@ Repo:http://noiz2-droid.googlecode.com/svn/trunk/noiz2/
 Build Version:1.4.0,12,15,target=android-3
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.0
 Current Version Code:12
 
diff --git a/metadata/com.newsblur.txt b/metadata/com.newsblur.txt
index 6659c6f0cf..c90e7dfd2a 100644
--- a/metadata/com.newsblur.txt
+++ b/metadata/com.newsblur.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:MIT
 Web Site:http://newsblur.com
 Source Code:https://github.com/samuelclay/NewsBlur
@@ -15,36 +15,86 @@ newsblur.com.  The feeds can be read in a web browser or using this app.
 Repo Type:git
 Repo:https://github.com/samuelclay/NewsBlur.git
 
-Build Version:1.0.0,24,f022c8b40,subdir=media/android/NewsBlur,srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.0.55,29,855b8d0,subdir=media/android/NewsBlur,srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.1,31,f460904d,init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,\
-subdir=media/android/NewsBlur,update=.;libs/ActionBarSherlock,prebuild=\
-cd ../../ && ls |grep -v android |xargs rm -rf && cd ../ && ls |grep -v media |xargs rm -rf
-Build Version:1.2,32,8b13f22a,init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,\
-subdir=media/android/NewsBlur,update=.;libs/ActionBarSherlock,prebuild=\
-cd ../../ && ls |grep -v android |xargs rm -rf && cd ../ && ls |grep -v media |xargs rm -rf
-Build Version:1.3.2,35,6a8e8e309b27076d2d15fc0,subdir=media/android/NewsBlur,init=\
-rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,update=.;libs/ActionBarSherlock,\
-srclibs=Google-Gson@gson-2.2.4,prebuild=cd ../../ && ls |grep -v android |xargs rm -rf && \
-cd ../ && ls |grep -v media |xargs rm -rf && echo "android.library.reference.2=$$Google-Gson$$" > project.properties
-Build Version:2.0.2,38,bfff77749,subdir=clients/android/NewsBlur,init=\
-rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,\
-srclibs=Google-Gson@gson-2.2.4,update=.;libs/ActionBarSherlock,prebuild=\
-cp -r $$Google-Gson$$/src/main/java/com/google src/com/ && \
-rm libs/gson*.jar && cd ../../ && ls |grep -v android |xargs rm -rf && cd ../ && \
-ls |grep -v clients |xargs rm -rf 
+Build:1.0.0,24
+    commit=f022c8b40
+    subdir=media/android/NewsBlur
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
-Build Version:2.5.0,43,b3eb49128b32,subdir=clients/android/NewsBlur,\
-init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,\
-update=.;libs/ActionBarSherlock,\
-prebuild=cd ../../ && ls |grep -v android |xargs rm -rf && \
-         cd ../ && ls |grep -v clients |xargs rm -rf 
+Build:1.0.55,29
+    commit=855b8d0
+    subdir=media/android/NewsBlur
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.1,31
+    commit=f460904d
+    subdir=media/android/NewsBlur
+    init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/
+    update=.;libs/ActionBarSherlock
+    prebuild=cd ../../ && \
+        ls |grep -v android |xargs rm -rf && \
+        cd ../ && \
+        ls |grep -v media |xargs rm -rf
+
+Build:1.2,32
+    commit=8b13f22a
+    subdir=media/android/NewsBlur
+    init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/
+    update=.;libs/ActionBarSherlock
+    prebuild=cd ../../ && \
+        ls |grep -v android |xargs rm -rf && \
+        cd ../ && \
+        ls |grep -v media |xargs rm -rf
+
+Build:1.3.2,35
+    commit=6a8e8e309b27076d2d15fc0
+    subdir=media/android/NewsBlur
+    init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/
+    update=.;libs/ActionBarSherlock
+    srclibs=Google-Gson@gson-2.2.4
+    prebuild=cd ../../ && \
+        ls |grep -v android |xargs rm -rf && \
+        cd ../ && \
+        ls |grep -v media |xargs rm -rf && \
+        echo "android.library.reference.2=$$Google-Gson$$" > project.properties
+
+Build:2.0.2,38
+    commit=bfff77749
+    subdir=clients/android/NewsBlur
+    init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/
+    update=.;libs/ActionBarSherlock
+    srclibs=Google-Gson@gson-2.2.4
+    prebuild=cp -r $$Google-Gson$$/src/main/java/com/google src/com/ && \
+        rm libs/gson*.jar && \
+        cd ../../ && \
+        ls |grep -v android |xargs rm -rf && \
+        cd ../ && \
+        ls |grep -v clients |xargs rm -rf 
+
+Build:2.5.0,43
+    commit=b3eb49128b32
+    subdir=clients/android/NewsBlur
+    init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/
+    update=.;libs/ActionBarSherlock
+    prebuild=cd ../../ && \
+        ls |g rep -v android | xargs rm -rf && \
+        cd ../ && \
+        ls | grep -v clients | xargs rm -rf 
+
+Build:3.0.0,44
+    commit=0d3e904e3549b
+    subdir=clients/android/NewsBlur
+    prebuild=cd ../.. && \
+        ls |g rep -v android | xargs rm -rf && \
+        cd .. && \
+        ls | grep -v clients | xargs rm -rf 
+
+Build:3.0.0,50
+    disable=Not a real version
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.5.0
-Current Version Code:43
+Update Check Mode:RepoManifest
+Current Version:3.0.0
+Current Version Code:50
 
diff --git a/metadata/com.nexes.manager.txt b/metadata/com.nexes.manager.txt
index 94bafbee76..d8a56029a8 100644
--- a/metadata/com.nexes.manager.txt
+++ b/metadata/com.nexes.manager.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://github.com/nexes/Android-File-Manager
 Source Code:http://github.com/nexes/Android-File-Manager
@@ -18,8 +18,7 @@ Build Version:2.1.2,212,7bca6266be731085ac92
 Build Version:2.1.8,218,edf793a782861ae31648
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.1.8
 Current Version Code:218
 
diff --git a/metadata/com.nightshadelabs.anotherbrowser.txt b/metadata/com.nightshadelabs.anotherbrowser.txt
index 641baaac5d..9de837fa0c 100644
--- a/metadata/com.nightshadelabs.anotherbrowser.txt
+++ b/metadata/com.nightshadelabs.anotherbrowser.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/GodsMoon/Flashify
 Source Code:https://github.com/GodsMoon/Flashify
diff --git a/metadata/com.nilhcem.frcndict.txt b/metadata/com.nilhcem.frcndict.txt
index 6af16ef1f0..51a476832c 100644
--- a/metadata/com.nilhcem.frcndict.txt
+++ b/metadata/com.nilhcem.frcndict.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:NewBSD
 Web Site:https://github.com/Nilhcem/frcndict-android
 Source Code:https://github.com/Nilhcem/frcndict-android
@@ -13,13 +13,21 @@ Older versions require a modified version of the [http://www.chine-informations.
 Repo Type:git
 Repo:https://github.com/Nilhcem/frcndict-android
 
-Build Version:1.6.1,8,v1.6.1,prebuild=\
-sed -i 's/logging\.level=4/logging.level=0/' ant.properties && ant clean config
-Build Version:1.7.1,10,v1.7.1,prebuild=\
-sed -i 's/logging\.level=4/logging.level=0/' ant.properties && ant clean config
+Build:1.6.1,8
+    commit=v1.6.1
+    prebuild=sed -i 's/logging\.level=4/logging.level=0/' ant.properties && \
+        ant clean config
+
+Build:1.7.1,10
+    commit=v1.7.1
+    prebuild=sed -i 's/logging\.level=4/logging.level=0/' ant.properties && \
+        ant clean config
+
+Build:1.8.0,11
+    commit=v1.8
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.7.1
-Current Version Code:10
+Current Version:1.8.0
+Current Version Code:11
 
diff --git a/metadata/com.nilhcem.hostseditor.txt b/metadata/com.nilhcem.hostseditor.txt
index 1bc79756fc..6a6d473e6a 100644
--- a/metadata/com.nilhcem.hostseditor.txt
+++ b/metadata/com.nilhcem.hostseditor.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/Nilhcem/hosts-editor-android
@@ -18,11 +18,19 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/Nilhcem/hosts-editor-android
 
-Build Version:1.1,2,ab85d7a8268f3c3,srclibs=ActionBarSherlock@4.3.1,prebuild=\
-rm -rf contrib .settings/ && sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' project.properties
+Build:1.1,2
+    commit=ab85d7a8268f3c3
+    srclibs=ActionBarSherlock@4.3.1
+    prebuild=rm -rf contrib .settings/ && \
+        sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' project.properties
+
+Build:1.2,3
+    disable=remove apk
+    commit=v1.2
+    submodules=yes
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/com.niparasc.papanikolis.txt b/metadata/com.niparasc.papanikolis.txt
new file mode 100644
index 0000000000..05d6a16cd4
--- /dev/null
+++ b/metadata/com.niparasc.papanikolis.txt
@@ -0,0 +1,30 @@
+Categories:Games
+License:GPLv3
+Web Site:http://niparasc.blogspot.com
+Source Code:https://github.com/niparasc/papanikolis-submarine
+Issue Tracker:https://github.com/niparasc/papanikolis-submarine/issues
+
+Auto Name:Papanikolis Submarine
+Summary:Multiplayer 2-D game
+Description:
+Steer the submarine through the caverns. Can be played with a friend
+via bluetooth.
+.
+
+Repo Type:git
+Repo:https://github.com/niparasc/papanikolis-submarine.git
+
+Build:1.0,1
+    commit=06140e
+    subdir=papanikolis-android
+    init=zip -r native.zip libs/armeabi* && \
+        mv ../papanikolis/libs/* libs/ && \
+        rm libs/*sources.jar && \
+        echo 'source.dir=src;../papanikolis/src' > ant.properties
+    build=unzip native.zip
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/com.nolanlawson.apptracker.txt b/metadata/com.nolanlawson.apptracker.txt
index be487b4bc0..709d8b40fe 100644
--- a/metadata/com.nolanlawson.apptracker.txt
+++ b/metadata/com.nolanlawson.apptracker.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:WTFPL
 Web Site:https://github.com/nolanlawson/AppTracker
 Source Code:https://github.com/nolanlawson/AppTracker
diff --git a/metadata/com.nolanlawson.chordreader.txt b/metadata/com.nolanlawson.chordreader.txt
index dfdd309175..3461e1ef9b 100644
--- a/metadata/com.nolanlawson.chordreader.txt
+++ b/metadata/com.nolanlawson.chordreader.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:WTFPL
 Web Site:https://github.com/nolanlawson/ChordReaderRoot
 Source Code:https://github.com/nolanlawson/ChordReaderRoot
diff --git a/metadata/com.nolanlawson.jnameconverter.txt b/metadata/com.nolanlawson.jnameconverter.txt
index 28575d7c3a..4784e7d028 100644
--- a/metadata/com.nolanlawson.jnameconverter.txt
+++ b/metadata/com.nolanlawson.jnameconverter.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:WTFPL
 Web Site:https://github.com/nolanlawson/JapaneseNameConverterRoot
 Source Code:https://github.com/nolanlawson/JapaneseNameConverterRoot
@@ -21,8 +21,7 @@ mv lib libs && mvn package -f ../JapaneseNameConverter-preprocessing/pom.xml &&
 mv ../JapaneseNameConverter-preprocessing/target/japanese-name-generator-v3-1.0-SNAPSHOT.jar libs/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
 
diff --git a/metadata/com.nolanlawson.keepscore.txt b/metadata/com.nolanlawson.keepscore.txt
index 5819796182..9b6fa6077a 100644
--- a/metadata/com.nolanlawson.keepscore.txt
+++ b/metadata/com.nolanlawson.keepscore.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:WTFPL
 Web Site:https://github.com/nolanlawson/KeepScore
 Source Code:https://github.com/nolanlawson/KeepScore
@@ -8,25 +8,51 @@ Donate:http://nolanlawson.com/donate
 Auto Name:KeepScore
 Summary:User-friendly score keeper
 Description:
-Need to keep score for a game? Throw away the pen and paper!
-
-"KeepScore is a free and open-source score keeper that can be used with any points-based game, from cribbage to Carcassonne. I’m a big board gamer, so I wrote it to help me and my friends when we play games together."
+Keep track of scores for any points-based game without pen and paper.
 .
 
 Repo Type:git
 Repo:https://github.com/nolanlawson/KeepScore.git
 
-Build Version:1.1.4,15,v1.1.4,subdir=KeepScore
-Build Version:1.2,17,v1.2,subdir=KeepScore,srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.3,20,v1.2.3,subdir=KeepScore,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.4,21,v1.2.4,subdir=KeepScore,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:1.1.4,15
+    commit=v1.1.4
+    subdir=KeepScore
+
+Build:1.2,17
+    commit=v1.2
+    subdir=KeepScore
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.3,20
+    commit=v1.2.3
+    subdir=KeepScore
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.4,21
+    commit=v1.2.4
+    subdir=KeepScore
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.6,23
+    commit=v1.2.6
+    subdir=KeepScore
+    srclibs=1:ActionBarSherlock@4.2.0
+
+Build:1.3.1,25
+    commit=v1.3.1
+    subdir=KeepScore
+    srclibs=1:ActionBarSherlock@4.2.0;2:Color-Picker-2@0e34279ed520
+
+Build:1.4.0,26
+    commit=v1.4.0
+    subdir=KeepScore
+    srclibs=1:ActionBarSherlock@4.2.0;2:Color-Picker-2@0e34279ed520
 
 Auto Update Mode:None
-#Device-variable
 Update Check Mode:Tags
-Current Version:1.2.4
-Current Version Code:21
+Current Version:1.4.0
+Current Version Code:26
 
diff --git a/metadata/com.nolanlawson.logcat.txt b/metadata/com.nolanlawson.logcat.txt
index b658a611de..2dfec74fc7 100644
--- a/metadata/com.nolanlawson.logcat.txt
+++ b/metadata/com.nolanlawson.logcat.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:WTFPL
 Web Site:https://github.com/nolanlawson/Catlog
 Source Code:https://github.com/nolanlawson/Catlog
diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
index 99a08b60f3..e0eb23a9c8 100644
--- a/metadata/com.nononsenseapps.notepad.txt
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -1,5 +1,5 @@
 Disabled:Disable until FOSS branch created, or until GMS patch and local sync can be achieved
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/spacecowboy/NotePad
 Source Code:https://github.com/spacecowboy/NotePad
@@ -23,23 +23,59 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/spacecowboy/NotePad.git
 
-Build Version:3.5.4,34,80dbfc,target=android-15
-Build Version:3.6.1,37,3.6.1-release,init=rm -f build.xml custom_rules.xml,prebuild=\
-rm -f *.zip *.png *.7z *.psd
-Build Version:3.6.2,38,3.6.2-release,init=rm -f build.xml custom_rules.xml,prebuild=\
-rm -f *.zip *.png *.7z *.psd
-Build Version:3.6.3,39,3.6.3-release,init=rm -f build.xml custom_rules.xml,prebuild=\
-rm -f *.zip *.png *.7z *.psd
-Build Version:3.6.4,40,3.6.4-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
-Build Version:4.0,42,4.0-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
-Build Version:4.1,43,4.1-rel,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
-Build Version:4.3,46,4.3-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
-Build Version:4.4.1,49,4.4.1-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
-Build Version:5.0,88,!Uses GMS to provide location reminders at 0013b649c817,subdir=NoNonsenseNotes,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd
+Build:3.5.4,34
+    commit=80dbfc
+    target=android-15
+
+Build:3.6.1,37
+    commit=3.6.1-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:3.6.2,38
+    commit=3.6.2-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:3.6.3,39
+    commit=3.6.3-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:3.6.4,40
+    commit=3.6.4-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:4.0,42
+    commit=4.0-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:4.1,43
+    commit=4.1-rel
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:4.3,46
+    commit=4.3-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:4.4.1,49
+    commit=4.4.1-release
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
+
+Build:5.0,88
+    disable=Uses GMS to provide location reminders at 0013b649c817
+    commit=0013b649c817
+    subdir=NoNonsenseNotes
+    init=rm -f build.xml custom_rules.xml
+    prebuild=rm -f *.zip *.png *.7z *.psd
 
 Auto Update Mode:None
-# Also on gplay
-Update Check Mode:RepoManifest
-Current Version:5.1-beta3
-Current Version Code:101
+Update Check Mode:Tags
+Current Version:5.1.3
+Current Version Code:106
 
diff --git a/metadata/com.nooskewl.bobby.txt b/metadata/com.nooskewl.bobby.txt
index c7938fa677..0ff3ad6244 100644
--- a/metadata/com.nooskewl.bobby.txt
+++ b/metadata/com.nooskewl.bobby.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 # Allegro is zlib; Bobby is "choose your licence"
 License:Zlib
 Web Site:http://www.nooskewl.com/content/bobby
diff --git a/metadata/com.noshufou.android.su.txt b/metadata/com.noshufou.android.su.txt
index 2c354658d6..cb2daa3d9e 100644
--- a/metadata/com.noshufou.android.su.txt
+++ b/metadata/com.noshufou.android.su.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://androidsu.com/superuser
 Source Code:https://github.com/ChainsDD/Superuser
diff --git a/metadata/com.notriddle.budget.txt b/metadata/com.notriddle.budget.txt
index dcc1e0d1ee..713f8320b2 100644
--- a/metadata/com.notriddle.budget.txt
+++ b/metadata/com.notriddle.budget.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:https://www.notriddle.com
 Source Code:https://github.com/notriddle/budget-envelopes
@@ -20,18 +20,41 @@ Think of a cheque book, only more flexible.
 Repo Type:git
 Repo:https://github.com/notriddle/budget-envelopes.git
 
-Build Version:1.0,10,1.0
-Build Version:1.2,12,1.2
-Build Version:1.3,13,1.3
-Build Version:1.4,14,1.4
-Build Version:1.5,15,1.5
-Build Version:1.6,16,1.6
-Build Version:1.7,17,1.7
-Build Version:3.0,30,3.0
-Build Version:3.2,32,3.2
+Build:1.0,10
+    commit=1.0
+
+Build:1.2,12
+    commit=1.2
+
+Build:1.3,13
+    commit=1.3
+
+Build:1.4,14
+    commit=1.4
+
+Build:1.5,15
+    commit=1.5
+
+Build:1.6,16
+    commit=1.6
+
+Build:1.7,17
+    commit=1.7
+
+Build:3.0,30
+    commit=3.0
+
+Build:3.2,32
+    commit=3.2
+
+Build:3.4,34
+    commit=3.4
+
+Build:4.0,40
+    commit=4.0
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:3.2
-Current Version Code:32
+Current Version:4.0
+Current Version Code:40
 
diff --git a/metadata/com.notriddle.null_launcer.txt b/metadata/com.notriddle.null_launcer.txt
index a6d8509748..0804334c26 100644
--- a/metadata/com.notriddle.null_launcer.txt
+++ b/metadata/com.notriddle.null_launcer.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://www.notriddle.com
 Source Code:https://github.com/notriddle/null-launcher
diff --git a/metadata/com.omegavesko.holocounter.txt b/metadata/com.omegavesko.holocounter.txt
index 81d8dbbac9..a1cc23a9a6 100644
--- a/metadata/com.omegavesko.holocounter.txt
+++ b/metadata/com.omegavesko.holocounter.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:https://github.com/omegavesko/HoloCounter
 Source Code:https://github.com/omegavesko/HoloCounter
diff --git a/metadata/com.opendoorstudios.ds4droid.txt b/metadata/com.opendoorstudios.ds4droid.txt
index 27c14a3872..3fd2a37bd5 100644
--- a/metadata/com.opendoorstudios.ds4droid.txt
+++ b/metadata/com.opendoorstudios.ds4droid.txt
@@ -1,59 +1,156 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://nds4droid.com
 Source Code:http://sourceforge.net/p/nds4droid/code/
 Issue Tracker:http://sourceforge.net/p/nds4droid/tickets/
+Donate:http://jeffq.com/blog/nds4droid/
 
 Auto Name:nds4droid
 Summary:Nintendo DS emulator
 Description:
-nds4droid is a free, open source Nintendo DS emulator for Android based
-on DeSmuME. It is currently in it's infancy but does support most of the
-features one would expect in an emulator. Runs on x86 natively.
+nds4droid is a Nintendo DS emulator, based on DeSmuME. It is currently in its
+infancy but does support most of the features one would expect in an emulator.
+Runs on x86 natively.
 
-Unlike official version this build does not support RAR archives,
-because of legal reasons.
+Unlike official version this build does not support RAR archives.
 .
 
 Repo Type:git
 Repo:git://git.code.sf.net/p/nds4droid/code
 
-Build Version:13,13,release13,patch=fix_stuff.patch,\
-rm=jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/armeabi-v7a/libc.so,\
-target=android-15,extlibs=acra/acra-4.2.3.jar,buildjni=yes
-Build Version:21,21,release21,target=android-16,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:23,23,release23,target=android-16,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:25,25,release25,target=android-16,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:26,26,release26,target=android-16,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:27,27,release27,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:28,28,release28,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:29,29,release29,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:30,30,release30,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:40,40,release40,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:42,42,!weird ndk problems at release42,target=android-17,extlibs=acra/acra-4.2.3.jar,\
-buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
-rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+Build:13,13
+    commit=release13
+    target=android-15
+    rm=jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/armeabi-v7a/libc.so
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff.patch
+    buildjni=yes
 
+Build:21,21
+    commit=release21
+    target=android-16
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:23,23
+    commit=release23
+    target=android-16
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:25,25
+    commit=release25
+    target=android-16
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:26,26
+    commit=release26
+    target=android-16
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:27,27
+    commit=release27
+    target=android-17
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:28,28
+    commit=release28
+    target=android-17
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:29,29
+    commit=release29
+    target=android-17
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:30,30
+    commit=release30
+    target=android-17
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:40,40
+    commit=release40
+    target=android-17
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
+    buildjni=yes
+
+Build:42,423
+    commit=release42
+    forcevercode=yes
+    extlibs=acra/acra-4.2.3.jar
+    patch=fix_stuff_2.patch
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk
+    scanignore=jni/android-ndk-profiler
+    scandelete=jni/desmume
+    buildjni=yes
+
+Build:44,441
+    commit=release44
+    forcevercode=yes
+    patch=fix_stuff_2.patch
+    prebuild=echo 'APP_ABI=x86' >> jni/Application.mk
+    scanignore=jni/android-ndk-profiler
+    scandelete=jni/desmume
+    buildjni=yes
+
+Build:44,443
+    commit=release44
+    forcevercode=yes
+    patch=fix_stuff_2.patch
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk
+    scanignore=jni/android-ndk-profiler
+    scandelete=jni/desmume
+    buildjni=yes
+
+Build:45,451
+    commit=release45
+    forcevercode=yes
+    patch=fix_stuff_2.patch
+    prebuild=echo 'APP_ABI=x86' >> jni/Application.mk
+    scanignore=jni/android-ndk-profiler
+    scandelete=jni/desmume;libs
+    buildjni=yes
+
+Build:45,453
+    commit=release45
+    forcevercode=yes
+    patch=fix_stuff_2.patch
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk
+    scanignore=jni/android-ndk-profiler
+    scandelete=jni/desmume;libs
+    buildjni=yes
+
+# +0: - (upstream)
+# +1: x86
+# +2: arm
+# +3: armv7 (CV)
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:42
-Current Version Code:42
+Vercode Operation:%c*10 + 3
+Current Version:45
+Current Version Code:453
 
diff --git a/metadata/com.orphan.amplayer.txt b/metadata/com.orphan.amplayer.txt
new file mode 100644
index 0000000000..3daedb5e96
--- /dev/null
+++ b/metadata/com.orphan.amplayer.txt
@@ -0,0 +1,35 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:
+Source Code:https://github.com/abeiro/amplayer.droid
+Issue Tracker:https://github.com/abeiro/amplayer.droid/issues
+
+Auto Name:AMPlayer
+Summary:Network music player
+Description:
+Play your music collection via the internet by connecting to 
+an [https://github.com/ampache/ampache Ampache] server e.g. ownCloud.
+A demo server is suggested for trying it out. 
+There is a companion 
+[https://chrome.google.com/webstore/detail/ampache-player/fgmlgjpjedpnhbbpahgcknnjkhlbjhgp extension]
+for the Chromium browser.
+
+*HTML5 audio tag capabilities
+*HTML5 localStorage
+*Playlists and CD covers from your Ampache Server
+*Fan art from fanart.tv
+*[http://musicbrainz.org Musicbrainz] info
+*Initial support for lyrics (http://lyrics.wikia.com)
+.
+
+Repo Type:git
+Repo:https://github.com/abeiro/amplayer.droid.git
+
+Build:0.4.2,1
+    commit=79ba84d6522e
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.4.2
+Current Version Code:1
+
diff --git a/metadata/com.owncloud.android.txt b/metadata/com.owncloud.android.txt
index 2a72b44f1a..af4df36902 100644
--- a/metadata/com.owncloud.android.txt
+++ b/metadata/com.owncloud.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://owncloud.org
 Source Code:https://github.com/owncloud/android
@@ -15,30 +15,105 @@ Android app which enables you to view and upload files.
 Repo Type:git
 Repo:https://github.com/owncloud/android.git
 
-#Different source repo...
-#Build Version:1.0,1,ef7e2f5
-Build Version:1.3.1,103001,239be8fb4f,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.7,103007,e7ed69aeed,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.8,103008,be22e58b39,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.12,103012,oc-android-1-3-12,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.14,103014,oc-android-1-3-14,submodules=yes,prebuild=\
-$$SDK$$/tools/android update project -p actionbarsherlock/library -s -t 13
-Build Version:1.3.17,103017,oc-android-1-3-17,submodules=yes,prebuild=\
-$$SDK$$/tools/android update project -p actionbarsherlock/library -s -t 13
-Build Version:1.3.18,103018,oc-android-1-3-18,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.20,103020,oc-android-1-3-20,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.21,103021,oc-android-1-3-21,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.3.22,103022,oc-android-1-3-22,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.0,104000,oc-android-1-4-0,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.1,104001,oc-android-1.4.1,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.3,104003,oc-android-1.4.3,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.4,104004,oc-android-1.4.4,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.5,104005,oc-android-1.4.5,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.5,104005,oc-android-1.4.5,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.6,104006,oc-android-1.4.6,submodules=yes,update=.;actionbarsherlock/library
+Build:1.3.1,103001
+    commit=239be8fb4f
+    submodules=yes
+    update=.;actionbarsherlock/library
 
-Auto Update Mode:None
+Build:1.3.7,103007
+    commit=e7ed69aeed
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.8,103008
+    commit=be22e58b39
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.12,103012
+    commit=oc-android-1-3-12
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.14,103014
+    commit=oc-android-1-3-14
+    submodules=yes
+    prebuild=$$SDK$$/tools/android update project -p actionbarsherlock/library -s -t 13
+
+Build:1.3.17,103017
+    commit=oc-android-1-3-17
+    submodules=yes
+    prebuild=$$SDK$$/tools/android update project -p actionbarsherlock/library -s -t 13
+
+Build:1.3.18,103018
+    commit=oc-android-1-3-18
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.20,103020
+    commit=oc-android-1-3-20
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.21,103021
+    commit=oc-android-1-3-21
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.3.22,103022
+    commit=oc-android-1-3-22
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.0,104000
+    commit=oc-android-1-4-0
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.1,104001
+    commit=oc-android-1.4.1
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.3,104003
+    commit=oc-android-1.4.3
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.4,104004
+    commit=oc-android-1.4.4
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.5,104005
+    commit=oc-android-1.4.5
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.5,104005
+    commit=oc-android-1.4.5
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.4.6,104006
+    commit=oc-android-1.4.6
+    submodules=yes
+    update=.;actionbarsherlock/library
+
+Build:1.5.0,105000
+    commit=oc-android-1.5.0
+    submodules=yes
+
+Build:1.5.1,105001
+    commit=oc-android-1.5.1
+    submodules=yes
+
+Build:1.5.2,105002
+    commit=oc-android-1.5.2
+    submodules=yes
+
+Auto Update Mode:Version oc-android-%v
 Update Check Mode:Tags
-Current Version:1.4.6
-Current Version Code:104006
+Current Version:1.5.2
+Current Version Code:105002
 
diff --git a/metadata/com.palliser.nztides.txt b/metadata/com.palliser.nztides.txt
index 4eec6a7b4f..b632dd70a7 100644
--- a/metadata/com.palliser.nztides.txt
+++ b/metadata/com.palliser.nztides.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/nztides
-Source Code:http://code.google.com/p/nztides/source/list
-Issue Tracker:http://code.google.com/p/nztides/issues/list
+Source Code:http://code.google.com/p/nztides/source
+Issue Tracker:http://code.google.com/p/nztides/issues
 
 Auto Name:NZ Tides
 Summary:Tide table for New Zealand
@@ -15,12 +15,23 @@ is at risk. Predictions run till about the end of 2014 with version 5.
 Repo Type:git
 Repo:https://code.google.com/p/nztides
 
-Build Version:4.0,4,93f349,init=rm -rf ../packages,subdir=nztides_app,target=android-7
-Build Version:5,5,b5a82b,prebuild=rm -rf ../packages,subdir=nztides_app
+Build:4.0,4
+    commit=93f349
+    subdir=nztides_app
+    init=rm -rf ../packages
+    target=android-7
+
+Build:5,5
+    commit=b5a82b
+    subdir=nztides_app
+    prebuild=rm -rf ../packages
+
+Build:6,6
+    commit=6af80b648250
+    subdir=nztides_app
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:5
-Current Version Code:5
+Update Check Mode:RepoManifest
+Current Version:6
+Current Version Code:6
 
diff --git a/metadata/com.panaceasupplies.android.games.toytrain.txt b/metadata/com.panaceasupplies.android.games.toytrain.txt
index 49468444aa..30992ea16a 100644
--- a/metadata/com.panaceasupplies.android.games.toytrain.txt
+++ b/metadata/com.panaceasupplies.android.games.toytrain.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://ri-li.sourceforge.net/
 Source Code:https://github.com/dennis-sheil/commandergenius/tree/toytrain
diff --git a/metadata/com.paranoid.ParanoidWallpapers.txt b/metadata/com.paranoid.ParanoidWallpapers.txt
index 958cf76116..9e13f94c35 100644
--- a/metadata/com.paranoid.ParanoidWallpapers.txt
+++ b/metadata/com.paranoid.ParanoidWallpapers.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv2
 Web Site:http://www.paranoid-rom.com
 Source Code:https://github.com/ParanoidAndroid/android_packages_apps_ParanoidWallpapers 
diff --git a/metadata/com.passwordmaker.txt b/metadata/com.passwordmaker.txt
deleted file mode 100644
index 3371c1f772..0000000000
--- a/metadata/com.passwordmaker.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Disabled:Not and won't be in a public repo
-Category:Internet
-License:GPLv3
-Web Site:http://www.hansche.de/android/apoma/
-Source Code:http://passwordmaker.hansche.de/passwordmaker/src
-
-Summary:PasswordMaker for Android
-Description:
-N.B. Not related to PasswordMaker Pro.
-This won't be getting any more updates because the source
-code is no longer available in a public repository.
-
-PasswordMaker allows users to create and access unique, secure passwords.
-It is multi-platform and works
-by mixing the website url with unique info of your own choosing, such as a
-master password. The app
-creates an item in the share menu to quickly get at the password.
-For more info see passwordmaker.org.
-.
-
-#Not in use any more
-Repo Type:hg
-Repo:https://bitbucket.org/Loxley/passwordmaker
-
-Build Version:2.1.5,10,0c4427cfbc7d,target=android-15
-
-#Device variable
-Update Check Mode:Static
-Current Version:2.1.5
-Current Version Code:10
-
diff --git a/metadata/com.pilot51.voicenotify.txt b/metadata/com.pilot51.voicenotify.txt
index 06afed4725..bc59ee0e0b 100644
--- a/metadata/com.pilot51.voicenotify.txt
+++ b/metadata/com.pilot51.voicenotify.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://pilot51.com/wiki/Voice_Notify
 Source Code:https://github.com/pilot51/voicenotify
@@ -38,11 +38,20 @@ spoken text in the logcat.
 Repo Type:git
 Repo:https://github.com/pilot51/voicenotify.git
 
-Build Version:1.0.9.1,13,v1.0.9.1
-Build Version:1.0.10.1,15,v1.0.10.1
+Build:1.0.9.1,13
+    commit=v1.0.9.1
 
-Auto Update Mode:None
+Build:1.0.10.1,15
+    commit=v1.0.10.1
+
+Build:1.0.11,16
+    commit=v1.0.11
+
+Build:1.0.11.1,17
+    commit=v1.0.11.1
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.0.10.1
-Current Version Code:15
+Current Version:1.0.11.1
+Current Version Code:17
 
diff --git a/metadata/com.pindroid.txt b/metadata/com.pindroid.txt
index 6870b5be38..34a9fbed3a 100644
--- a/metadata/com.pindroid.txt
+++ b/metadata/com.pindroid.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/maxpower47/PinDroid
 Source Code:https://github.com/maxpower47/PinDroid
@@ -35,22 +35,11 @@ Build Version:2.3.0,53,v2.3.0,target=android-17
 Build Version:2.3.1,54,v2.3.1,target=android-17
 Build Version:2.3.2,55,v2.3.2,target=android-17
 Build Version:2.3.3,56,v2.3.3,target=android-17
-# or
-Build Version:2.4.0,58,!beta at v2.4.0b58,\
-rm=libs/dashclock-api-r1.1.jar,\
-srclibs=DashClock@v1.2;Support-v7@android-4.3_r2.1,\
-target=android-18,\
-prebuild=sed -i 's@\(.1=\).*@\1$$Support-v7$$@' project.properties && \
-         mv libs/android-support-v4.jar $$Support-v7$$/libs/ && \
-         echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties
-# or
-Build Version:2.4.0,59,!beta at v2.4.0b58,\
-rm=libs/dashclock-api-r1.1.jar,\
-srclibs=DashClock@v1.2,\
-target=android-18,\
-prebuild=cp -r $$SDK$$/extras/android/support/v7/appcompat . && \
-         sed -i 's@\(.1=\).*@\1appcompat@' project.properties && \
-         echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties
+
+Build:2.4.0,59
+	disable=beta
+	commit=v2.4.0
+	target=android-17
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.piratebayfree.txt b/metadata/com.piratebayfree.txt
new file mode 100644
index 0000000000..ab350fbd7b
--- /dev/null
+++ b/metadata/com.piratebayfree.txt
@@ -0,0 +1,49 @@
+AntiFeatures:UpstreamNonFree
+Categories:Internet
+License:GPL
+Web Site:http://tpbapp.com
+Source Code:https://github.com/tpbapp/Pirate-Proxy
+Issue Tracker:https://github.com/tpbapp/Pirate-Proxy/issues
+Bitcoin:1KeBs4HBQzkdHC2ou3gpyGHqcL7aKzwTve
+Litecoin:LiYp3Dg11N5BgV8qKW42ubSZXFmjDByjoV
+
+Auto Name:TPB Proxy
+Summary:Access for Pirate Bay website
+Description:
+Proxy(s) for the ever-moving Pirate Bay torrent indexing website;
+ideal for people struggling with Internet censorship such as those residing in 
+the UK, Ireland, Netherlands, Belgium or Finland. 
+TPB Proxy automatically unblocks The Pirate Bay and provides fast 
+and stable access to Linux ISO torrents.
+
+More recent versions, for which there isn't source code, allow you
+to do more, but this version only allows you to choose proxies and
+open the website in a browser.
+
+This is the 'free' (as in gratis) version.
+
+Several proprietary libraries were removed.
+.
+
+Repo Type:git
+Repo:https://github.com/tpbapp/Pirate-Proxy.git
+
+Build:1.06,8
+    commit=v1.06
+    init=sed -i '/preference/d' project.properties
+    rm=libs/libGoogleAnalyticsServices.jar;libs/newrelic.android.jar
+    srclibs=1:NoAnalytics@d38ae535b543
+    patch=proprietary_8.patch
+
+Maintainer Notes:
+Update the second paragraph of description for the next version;
+currently 1.3 is on Google Play
+.
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.06
+Current Version Code:8
+
+No Source Since:1.06
+
diff --git a/metadata/com.piratebayfree/proprietary_8.patch b/metadata/com.piratebayfree/proprietary_8.patch
new file mode 100644
index 0000000000..8bfc100de9
--- /dev/null
+++ b/metadata/com.piratebayfree/proprietary_8.patch
@@ -0,0 +1,90 @@
+diff --git a/AndroidManifest.xml b/AndroidManifest.xml
+index 1b4af04..b01f6a2 100644
+--- a/AndroidManifest.xml
++++ b/AndroidManifest.xml
+@@ -68,14 +68,6 @@
+                 android:value="com.piratebay.activities.AboutActivity" />
+         </activity>
+         
+-        <!-- Google Play -->
+-    	<meta-data android:name="com.google.android.gms.version"
+-             android:value="@integer/google_play_services_version" />
+-    	
+-    	<activity android:name="com.google.android.gms.ads.AdActivity"
+-             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
+-
+-    
+         
+     </application>
+ 
+diff --git a/src/com/piratebayfree/activities/MainActivity.java b/src/com/piratebayfree/activities/MainActivity.java
+index eccd3a1..41a2256 100644
+--- a/src/com/piratebayfree/activities/MainActivity.java
++++ b/src/com/piratebayfree/activities/MainActivity.java
+@@ -1,10 +1,7 @@
+ package com.piratebayfree.activities;
+ 
+-import com.newrelic.agent.android.NewRelic;
+-
+ import com.google.analytics.tracking.android.EasyTracker;
+ 
+-import com.google.android.gms.ads.*;
+ import com.piratebayfree.Category;
+ import com.piratebayfree.Database;
+ import com.piratebayfree.Proxy;
+@@ -72,7 +69,6 @@ public class MainActivity extends Activity implements TextWatcher, OnKeyListener
+ 	private ImageView statusicon;
+ 	private TextView statustext;
+ 	private ImageView advert;
+-	private AdView admob;
+ 	private ProgressBar loading;
+ 	private DrawerLayout drawer;
+ 	private ListView categorylist;
+@@ -166,10 +162,6 @@ public class MainActivity extends Activity implements TextWatcher, OnKeyListener
+     	
+         db.deleteLogs();
+ 		
+-		loadAds();
+-		
+-		loadTracking();
+-        
+ 	}
+ 	  
+ 	@Override
+@@ -194,36 +186,6 @@ public class MainActivity extends Activity implements TextWatcher, OnKeyListener
+ 	}
+ 
+ 	// Ads
+-	private void loadAds() {
+-		
+-	    admob = new AdView(this);
+-	    
+-	    admob.setAdUnitId(ADMOB);
+-	    admob.setAdSize(AdSize.BANNER);
+-	    
+-	    RelativeLayout layout = (RelativeLayout) findViewById(R.id.main_activity);
+-	    
+-	    RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
+-	    	    RelativeLayout.LayoutParams.WRAP_CONTENT, 
+-	    	    RelativeLayout.LayoutParams.WRAP_CONTENT);
+-	    
+-	    params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+-
+-	    layout.addView(admob, params);
+-
+-	    AdRequest request = new AdRequest.Builder().build();
+-
+-	    admob.loadAd(request);
+-
+-
+-	}
+-	
+-	// Tracking
+-	private void loadTracking() {
+-	
+-		NewRelic.withApplicationToken(NEWRELIC).start(this.getApplication());
+-
+-	}
+ 
+ 	@Override
+ 	public void onStart() {
diff --git a/metadata/com.piwi.stickeroid.txt b/metadata/com.piwi.stickeroid.txt
index f27ba8dba0..ea6cd5fcdd 100644
--- a/metadata/com.piwi.stickeroid.txt
+++ b/metadata/com.piwi.stickeroid.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://code.google.com/p/stickeroid/
-Source Code:http://code.google.com/p/stickeroid/source/checkout
-Issue Tracker:http://code.google.com/p/stickeroid/issues/list
+Source Code:http://code.google.com/p/stickeroid/source
+Issue Tracker:http://code.google.com/p/stickeroid/issues
 
 Auto Name:Stickeroid
 Summary:Stickers collection manager
diff --git a/metadata/com.plusonelabs.calendar.txt b/metadata/com.plusonelabs.calendar.txt
index 45e19e5798..2405dc6259 100644
--- a/metadata/com.plusonelabs.calendar.txt
+++ b/metadata/com.plusonelabs.calendar.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/plusonelabs/calendar-widget
@@ -14,11 +14,21 @@ can easily have a glimpse of your upcoming appointments.
 Repo Type:git
 Repo:https://github.com/plusonelabs/calendar-widget.git
 
-Build Version:1.6.2,14,c80eddb1,subdir=app/com.plusonelabs.calendar
+Build:1.6.2,14
+    commit=c80eddb1
+    subdir=app/com.plusonelabs.calendar
 
-Auto Update Mode:None
-# Tags were forgotten for latest; also on gplay
-Update Check Mode:RepoManifest
-Current Version:1.6.2
-Current Version Code:14
+Build:1.6.4,16
+    commit=v1.6.4
+    subdir=app/com.plusonelabs.calendar
+
+Build:1.7.2,19
+    commit=v1.7.2
+    subdir=app/calendar-widget
+    gradle=yes
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.7.2
+Current Version Code:19
 
diff --git a/metadata/com.polipoid.txt b/metadata/com.polipoid.txt
index 0831cdce1f..4b06b2c2d0 100644
--- a/metadata/com.polipoid.txt
+++ b/metadata/com.polipoid.txt
@@ -1,9 +1,9 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:
 Source Code:https://github.com/splondike/polipoid/
 Issue Tracker:https://github.com/splondike/polipoid/issues
-FlattrID:eef5109f143cf9d8c79e01371913c8f7
+Bitcoin:eef5109f143cf9d8c79e01371913c8f7
 
 Auto Name:Polipoid
 Summary:Wrapper for the polipo proxy
diff --git a/metadata/com.politedroid.txt b/metadata/com.politedroid.txt
index 1bc23c488f..924dcc6125 100644
--- a/metadata/com.politedroid.txt
+++ b/metadata/com.politedroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/miguelvps/PoliteDroid
 Source Code:https://github.com/miguelvps/PoliteDroid
diff --git a/metadata/com.powerje.nyan.txt b/metadata/com.powerje.nyan.txt
index 42f5b2187f..5edbdfbe2d 100644
--- a/metadata/com.powerje.nyan.txt
+++ b/metadata/com.powerje.nyan.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/powerje/NyanDroid
 Source Code:https://github.com/powerje/NyanDroid
diff --git a/metadata/com.proch.practicehub.txt b/metadata/com.proch.practicehub.txt
index 2ba8d04ec8..d0c8850602 100644
--- a/metadata/com.proch.practicehub.txt
+++ b/metadata/com.proch.practicehub.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/music-practice-tools/
-Source Code:http://code.google.com/p/music-practice-tools/source/checkout
-Issue Tracker:http://code.google.com/p/music-practice-tools/issues/list
+Source Code:http://code.google.com/p/music-practice-tools/source
+Issue Tracker:http://code.google.com/p/music-practice-tools/issues
 
 Auto Name:Practice Hub
 Summary:Tools for musicians
@@ -21,8 +21,7 @@ prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.pro
 echo "android.library.reference.2=$$NumberPicker-SimonVT$$" >> project.properties,buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0
 Current Version Code:2
 
diff --git a/metadata/com.purplefoto.pfdock.txt b/metadata/com.purplefoto.pfdock.txt
index 7a198625f8..be78bec1ac 100644
--- a/metadata/com.purplefoto.pfdock.txt
+++ b/metadata/com.purplefoto.pfdock.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://pfdock.purplefoto.com
 Source Code:https://github.com/ehcloninger/pf-public
diff --git a/metadata/com.qsp.player.txt b/metadata/com.qsp.player.txt
index 42b09d4427..c3cda04196 100644
--- a/metadata/com.qsp.player.txt
+++ b/metadata/com.qsp.player.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://qsp.su
 Source Code:http://qsp-android-player.googlecode.com/
@@ -17,6 +17,6 @@ Repo:http://qsp-android-player.googlecode.com/svn/trunk
 Build Version:1.0.201 alpha,201,204,buildjni=yes,extlibs=acra/acra-4.4.0.jar
 
 Auto Update Mode:None
-Update Check Mode:AndroidManifest
+Update Check Mode:RepoManifest
 Current Version:1.0.201 alpha
 Current Version Code:201
diff --git a/metadata/com.qubling.sidekick.txt b/metadata/com.qubling.sidekick.txt
index dc66dff64b..4300470dfd 100644
--- a/metadata/com.qubling.sidekick.txt
+++ b/metadata/com.qubling.sidekick.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Artistic Licensev2
 Web Site:https://github.com/zostay/CPAN-Sidekick
 Source Code:https://github.com/zostay/CPAN-Sidekick
@@ -29,10 +29,7 @@ Build Version:0.5.0,15,b1a5d30c1a,target=android-13
 Build Version:0.5.1,16,v0.5.1-vc16-2013-04-07,target=android-13
 
 Auto Update Mode:None
-#version name in res/
-# Let's see if the dev remembers to use tags for future versions
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.5.1
 Current Version Code:16
 
diff --git a/metadata/com.quran.labs.androidquran.txt b/metadata/com.quran.labs.androidquran.txt
index 340542410f..09b3d88887 100644
--- a/metadata/com.quran.labs.androidquran.txt
+++ b/metadata/com.quran.labs.androidquran.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 #See README
 License:Custom
 Web Site:https://github.com/ahmedre/quran_android
diff --git a/metadata/com.rackspace.cloud.android.txt b/metadata/com.rackspace.cloud.android.txt
deleted file mode 100644
index a6dd6e1c64..0000000000
--- a/metadata/com.rackspace.cloud.android.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Disabled:Never build, source repo deleted
-Category:Internet
-License:MIT
-Web Site:https://github.com/rackspace/android-rackspacecloud
-Source Code:https://github.com/rackspace/android-rackspacecloud
-Issue Tracker:https://github.com/rackspace/android-rackspacecloud/issues
-
-Summary:Monitor your servers
-Description:
-Log in with your API key that's available at manage.rackspacecloud.com.
-* Support for US, UK, and custom API endpoints
-* Support for multiple accounts
-* List all Cloud Servers in your account
-* Create new Cloud Servers (including from any existing backups)
-* Delete Cloud Servers
-* Resize Cloud Servers
-* Perform Hard and Soft Reboots
-* Manage backup schedules
-* Ping Cloud Servers
-* Rename Cloud Servers
-* Rebuild Cloud Servers
-* Change a Cloud Server's root password
-* View and Create Cloud Files Containers
-* Upload text files to Cloud Files
-* Download and Preview Cloud Files
-* Passcode Lock
-* Detailed Error Handling: if you get an error from the API, you can see exactly what happened with an equivalent curl command to reproduce it in a shell
-* Links to contact Rackspace Fanatical Support via phone or Twitter
-.
-
-#Repo deleted
-#Repo Type:git
-#Repo:https://github.com/rackspace/android-rackspacecloud.git
-
-Build Version:1.2,2,!wait for next release HEAD,srclibs=NoAnalytics@158a4a,prebuild=\
-echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties && \
-rm libs/libGoogleAnalytics.jar android-rackspacecloud.apk.zip
-
-Auto Update Mode:None
-Update Check Mode:Static
-
diff --git a/metadata/com.radioreddit.android.txt b/metadata/com.radioreddit.android.txt
index 8f5a6d668c..745ef0f7ee 100644
--- a/metadata/com.radioreddit.android.txt
+++ b/metadata/com.radioreddit.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/chris-blay/radio-reddit-for-Android
diff --git a/metadata/com.ratebeer.android.txt b/metadata/com.ratebeer.android.txt
index 3275a8e09c..6248b2e575 100644
--- a/metadata/com.ratebeer.android.txt
+++ b/metadata/com.ratebeer.android.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://www.ratebeer.com/
 Source Code:https://code.google.com/p/ratebeerforandroid/source
-Issue Tracker:https://code.google.com/p/ratebeerforandroid/issues/list
+Issue Tracker:https://code.google.com/p/ratebeerforandroid/issues
 
 Auto Name:RateBeer for Android
 Summary:RateBeer.com client
diff --git a/metadata/com.reicast.emulator.txt b/metadata/com.reicast.emulator.txt
new file mode 100644
index 0000000000..4879c3cbf3
--- /dev/null
+++ b/metadata/com.reicast.emulator.txt
@@ -0,0 +1,31 @@
+Categories:Games
+License:GPL
+Web Site:http://reicast.com/
+Source Code:https://github.com/reicast/reicast-emulator
+Issue Tracker:https://github.com/reicast/reicast-emulator/issues
+
+Summary:Sega Dreamcast Emulator
+Description:
+This is a fork/rewrite/remix of various versions of nulldc and nulldce.
+Bios/flash have to be on /sdcard/dc/data/dc_boot.bin and /sdcard/dc/data/dc_flash.bin.
+Supported game formats: gdi, chd.
+.
+
+Repo Type:git
+Repo:https://github.com/reicast/reicast-emulator.git
+
+Build:0.r5+,6
+    commit=c6e1d41b20cd0
+    subdir=reicast/android/
+    buildjni=yes
+    rm=reicast/android/libs/ouya-sdk.jar
+    init=echo "APP_CFLAGS+=-Wno-error=format-security" >> jni/Application.mk && \
+    find .. -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete
+    patch=omguya.patch
+    target=android-17
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.r5+
+Current Version Code:6
+
diff --git a/metadata/com.reicast.emulator/omguya.patch b/metadata/com.reicast.emulator/omguya.patch
new file mode 100644
index 0000000000..f416ee94d4
--- /dev/null
+++ b/metadata/com.reicast.emulator/omguya.patch
@@ -0,0 +1,84 @@
+diff --git a/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java b/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
+index 9809109..e32c965 100644
+--- a/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
++++ b/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
+@@ -3,8 +3,6 @@ package com.reicast.emulator;
+ import java.io.IOException;
+ import java.io.InputStream;
+ 
+-import tv.ouya.console.api.OuyaController;
+-
+ import com.reicast.emulator.GL2JNIView.EmuThread;
+ import com.example.newdc.JNIdc;
+ 
+@@ -161,22 +159,6 @@ public class GL2JNIActivity extends Activity
+ 		  //Get all the axis for the KeyEvent
+ 
+ 		//Joystick
+-	    if((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+-	        
+-	        //do other things with joystick
+-	        float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
+-		    float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
+-		    float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
+-		    float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
+-		    float L2 = event.getAxisValue(OuyaController.AXIS_L2);
+-		    float R2 = event.getAxisValue(OuyaController.AXIS_R2);
+-
+-		    GL2JNIView.lt = (int)(L2 * 255);
+-		    GL2JNIView.rt = (int)(R2 * 255);
+-
+-		    GL2JNIView.jx = (int)(LS_X * 126);
+-		    GL2JNIView.jy =  (int)(LS_Y * 126);
+-	    }
+ 
+ 
+ 		return true;
+@@ -194,35 +176,9 @@ public class GL2JNIActivity extends Activity
+   private static final int key_CONT_Y          = 0x0200;
+   private static final int key_CONT_X          = 0x0400;
+   
+-  int map[] = new int[] { 
+-		  OuyaController.BUTTON_O, 	key_CONT_A,
+-		  OuyaController.BUTTON_A, 	key_CONT_B,
+-		  OuyaController.BUTTON_Y, 	key_CONT_Y,
+-		  OuyaController.BUTTON_U, 	key_CONT_X,
+-		  
+-		  OuyaController.BUTTON_DPAD_UP, 		key_CONT_DPAD_UP,
+-		  OuyaController.BUTTON_DPAD_DOWN, 		key_CONT_DPAD_DOWN,
+-		  OuyaController.BUTTON_DPAD_LEFT, 		key_CONT_DPAD_LEFT,
+-		  OuyaController.BUTTON_DPAD_RIGHT, 	key_CONT_DPAD_RIGHT,
+-		  
+-		  OuyaController.BUTTON_MENU, key_CONT_START,
+-		  OuyaController.BUTTON_L1, key_CONT_START
+-		  
+-  };
+   
+   boolean handle_key(int kc, boolean down) {
+ 	  boolean rav = false;
+-	  for (int i=0;i<map.length;i+=2) {
+-		  if (map[i + 0] == kc) {
+-			  if (down)
+-				  this.rv &= ~map[i + 1];
+-			  else
+-				  this.rv |= map[i + 1];
+-			  
+-			  rav = true;
+-			  break;
+-		  }
+-	  }
+ 	  
+ 	  GL2JNIView.kcode_raw = rv;
+ 	  
+diff --git a/reicast/android/src/com/reicast/emulator/MainActivity.java b/reicast/android/src/com/reicast/emulator/MainActivity.java
+index 3944fc7..be071f8 100644
+--- a/reicast/android/src/com/reicast/emulator/MainActivity.java
++++ b/reicast/android/src/com/reicast/emulator/MainActivity.java
+@@ -29,7 +29,6 @@ import android.widget.TextView;
+ import android.widget.Toast;
+ import android.support.v4.app.NavUtils;
+ 
+-import tv.ouya.console.api.OuyaController;
+ import java.io.*;
+ 
+ public class MainActivity extends Activity {
diff --git a/metadata/com.replica.replicaisland.txt b/metadata/com.replica.replicaisland.txt
index 39aa20988c..ec19e3e2fc 100644
--- a/metadata/com.replica.replicaisland.txt
+++ b/metadata/com.replica.replicaisland.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:http://www.replicaisland.net/
-Source Code:http://code.google.com/p/replicaisland/source/checkout
-Issue Tracker:http://code.google.com/p/replicaisland/issues/list
+Source Code:http://code.google.com/p/replicaisland/source
+Issue Tracker:http://code.google.com/p/replicaisland/issues
 
 Auto Name:Replica Island
 Summary:Side-scrolling platform game
@@ -13,14 +13,14 @@ unique, challenging game play, Replica Island is a new take on the classic
 platformer genre.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://replicaisland.googlecode.com/svn/trunk/
 
-Build Version:1.4,14,7
+Build:1.4,14
+    commit=7
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4
 Current Version Code:14
 
diff --git a/metadata/com.rhiannonweb.android.migrainetracker.txt b/metadata/com.rhiannonweb.android.migrainetracker.txt
index fca8818d6c..d175d3c239 100644
--- a/metadata/com.rhiannonweb.android.migrainetracker.txt
+++ b/metadata/com.rhiannonweb.android.migrainetracker.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://sourceforge.net/projects/migrainetracker/
 Source Code:http://sourceforge.net/projects/migrainetracker/
@@ -20,8 +20,7 @@ Repo:http://hg.code.sf.net/p/migrainetracker/code
 Build Version:0.9b,2,ed91ba
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.9b
 Current Version Code:2
 
diff --git a/metadata/com.rigid.birthdroid.txt b/metadata/com.rigid.birthdroid.txt
index 2bec8e173d..a514fc8563 100644
--- a/metadata/com.rigid.birthdroid.txt
+++ b/metadata/com.rigid.birthdroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:
 Source Code:https://github.com/rigid/Birthdroid
@@ -14,12 +14,41 @@ Birthdroid lets you keep track of birthdays via a widget or the app itself.
 Repo Type:git
 Repo:https://github.com/rigid/Birthdroid.git
 
-Build Version:0.5,1,Birthdroid-0.5,target=android-10,prebuild=rm -rf bin/
-Build Version:0.6,2,Birthdroid-0.6,target=android-17,prebuild=rm -rf bin/,forcevercode=yes
-Build Version:0.6.1,61,Birthdroid-0.6.1,target=android-17,prebuild=rm -rf bin/
+Build:0.5,1
+    commit=Birthdroid-0.5
+    target=android-10
+    prebuild=rm -rf bin/
+
+Build:0.6,2
+    commit=Birthdroid-0.6
+    target=android-17
+    forcevercode=yes
+    prebuild=rm -rf bin/
+
+Build:0.6.1,61
+    commit=Birthdroid-0.6.1
+    target=android-17
+    prebuild=rm -rf bin/
+
+Build:0.6.2,62
+    commit=Birthdroid-0.6.2
+    target=android-19
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1
+    prebuild=cp libs/android-support-v4.jar $$Support$$/libs
+
+Build:0.6.3,63
+    commit=Birthdroid-0.6.3
+    target=android-19
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1
+    prebuild=cp libs/android-support-v4.jar $$Support$$/libs
+
+Maintainer Notes:
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.6.1
-Current Version Code:61
+Current Version:0.6.3
+Current Version Code:63
 
diff --git a/metadata/com.ringdroid.txt b/metadata/com.ringdroid.txt
index 435f824cfb..6dd5a420bd 100644
--- a/metadata/com.ringdroid.txt
+++ b/metadata/com.ringdroid.txt
@@ -1,7 +1,7 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://code.google.com/p/ringdroid/
-Source Code:http://code.google.com/p/ringdroid/source/checkout
+Source Code:http://code.google.com/p/ringdroid/source
 Issue Tracker:
 
 Auto Name:Ringdroid
diff --git a/metadata/com.rj.pixelesque.txt b/metadata/com.rj.pixelesque.txt
index aecc53d9aa..164bc95aa5 100644
--- a/metadata/com.rj.pixelesque.txt
+++ b/metadata/com.rj.pixelesque.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:NewBSD
 Web Site:https://github.com/rjmarsan/Pixelesque
 Source Code:https://github.com/rjmarsan/Pixelesque
@@ -23,8 +23,7 @@ prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$Processing-Multitouch$
 rm ./libs/AndMT.zip && rm -rf exports
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.01
 Current Version Code:7
 
diff --git a/metadata/com.robert.maps.txt b/metadata/com.robert.maps.txt
index 0dfe79085a..a95d9b422e 100644
--- a/metadata/com.robert.maps.txt
+++ b/metadata/com.robert.maps.txt
@@ -1,8 +1,9 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 License:GPLv3
 Web Site:http://robertdeveloper.blogspot.com/2009/08/rmaps.html
-Source Code:http://code.google.com/p/robertprojects/source/checkout
-Issue Tracker:http://code.google.com/p/robertprojects/issues/list
+Source Code:http://code.google.com/p/robertprojects/source
+Issue Tracker:http://code.google.com/p/robertprojects/issues
 Donate:http://robertdeveloper.blogspot.com
 
 Auto Name:RMaps
diff --git a/metadata/com.roguetemple.hydroid.txt b/metadata/com.roguetemple.hydroid.txt
index 03efa608cc..6d60355306 100644
--- a/metadata/com.roguetemple.hydroid.txt
+++ b/metadata/com.roguetemple.hydroid.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://www.roguetemple.com/z/hydroid.php
 Source Code:https://bitbucket.org/dalb8/hydra-slayer
@@ -8,21 +8,18 @@ Donate:http://www.roguetemple.com/z/hydroid.php
 Auto Name:Hydra Slayer
 Summary:Adventure game
 Description:
-Hydra Slayer is a roguelike (that is, a game where you control a single hero 
-fighting horde of monsters, with a high emphasis on tactics) where combat has 
-been inspired by some mathematical puzzles about brave heroes slaying many 
-headed beasts. 
+Hydra Slayer is a roguelike game where combat has been inspired by some
+mathematical puzzles about brave heroes slaying many headed beasts. 
 This might look like a standard dungeon crawler, but the puzzle element 
 is important, and the later game is meant to be challenging. 
-Be sure to try the tutorial first or visit the website to see the back story 
-and other tips and tricks.
+
 The character can be controlled by touching part of the screen to indicate
 direction, but bear in mind that walls can't be traversed!
 
-* In most menus, you can touch a menu item (on screen) to activate it; most actions can be also selected by pressing the Menu button.
-* On the race selection screen, click on the top part of the screen (which contains race names) or use D-pad to change race, and then touch the middle of the screen to play the chosen race.
-* On the game screen, touch the corner which contains the list of your weapons to switch weapons (the most common action), and touching the corner which contains the stats and list of enemies opens a single menu including all possible actions (while Menu button shows just five). You can also touch the message box at the bottom to see messages which did not fit on the screen. Touching anywhere else is a move.
-* Since this is based on a desktop game, most common actions can be also executed by pressing hardware buttons. For example, '''in the game, D-Pad moves''', Volume Up and Volume Down switch weapons, Call ("pick up phone") picks up items and climbs down stairs (just like the 'g' key on keyboard), and Search opens your inventory (like 'i').
+* In most menus, you can touch a menu item to activate it; most actions can be also selected by pressing the Menu button.
+* On the race selection screen, click on the top part of the screen or use D-pad to change race, and then touch the middle of the screen to play the chosen race.
+* On the game screen, touch the corner which contains the list of your weapons to switch weapons, and touching the corner opens a single menu including all possible actions.
+* Since this is based on a desktop game, most common actions can be also executed by pressing hardware buttons.
 * In questions, touching the top of the screen means yes and the bottom of the screen means no.
 .
 
diff --git a/metadata/com.roguetemple.hyperroid.txt b/metadata/com.roguetemple.hyperroid.txt
index c4f28d89e0..d1280a7303 100644
--- a/metadata/com.roguetemple.hyperroid.txt
+++ b/metadata/com.roguetemple.hyperroid.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://www.roguetemple.com/z/hyper.php
 Source Code:https://bitbucket.org/dalb8/hyperrogue-iii-for-android
diff --git a/metadata/com.roozen.SoundManagerv2.txt b/metadata/com.roozen.SoundManagerv2.txt
index 98465363d7..5462357e60 100644
--- a/metadata/com.roozen.SoundManagerv2.txt
+++ b/metadata/com.roozen.SoundManagerv2.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://sites.google.com/site/roozenandroidapps/home/sound-manager
-Source Code:http://code.google.com/p/app-soundmanager/source/checkout
-Issue Tracker:http://code.google.com/p/app-soundmanager/issues/list
+Source Code:http://code.google.com/p/app-soundmanager/source
+Issue Tracker:http://code.google.com/p/app-soundmanager/issues
 
 Auto Name:Sound Manager
 Summary:Volume level scheduler
diff --git a/metadata/com.ruesga.android.wallpapers.photophase.txt b/metadata/com.ruesga.android.wallpapers.photophase.txt
new file mode 100644
index 0000000000..989d930bae
--- /dev/null
+++ b/metadata/com.ruesga.android.wallpapers.photophase.txt
@@ -0,0 +1,30 @@
+Categories:Wallpaper
+License:Apache2
+Web Site:http://forum.xda-developers.com/showthread.php?p=46387352
+Source Code:https://github.com/jruesga/PhotoPhase
+Issue Tracker:https://github.com/jruesga/PhotoPhase/issues
+
+Auto Name:PhotoPhase
+Summary:Tiled images wallpaper
+Description:
+Live wallpaper that takes a selection of images and tiles a few of them,
+applying transitions and effects.
+
+There is an OpenGL issue with one type of chipset in v1.0.6 that can cause 
+the system to crash and the only fix is to uninstall the app.
+Note that Android has a 'safe mode' that disables all user-installed apps
+at start time, allowing you to uninstall troublesome apps.
+.
+
+Repo Type:git
+Repo:https://github.com/jruesga/PhotoPhase.git
+
+Build:1.0.6,1008
+    commit=v1.0.6
+    target=android-19
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.6
+Current Version Code:1008
+
diff --git a/metadata/com.saibotd.bitbeaker.txt b/metadata/com.saibotd.bitbeaker.txt
index 04023a2e85..f6eac3623b 100644
--- a/metadata/com.saibotd.bitbeaker.txt
+++ b/metadata/com.saibotd.bitbeaker.txt
@@ -1,10 +1,10 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:https://bitbucket.org/saibotd/bitbeaker
 Source Code:https://bitbucket.org/saibotd/bitbeaker/src
 Issue Tracker:https://bitbucket.org/saibotd/bitbeaker/issues
 
-Auto Name:bitbeaker
+Auto Name:Bitbeaker
 Summary:Bitbucket.org client
 Description:
 Bitbucket.org is a site that hosts code in git and hg (mercurial) repositories. You can
@@ -15,20 +15,37 @@ hosted there.
 Repo Type:hg
 Repo:https://bitbucket.org/saibotd/bitbeaker
 
-Build Version:2.1,11,b156ba,srclibs=ActionBarSherlock@6e3f2bb5,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:2.2,12,57aaf2,srclibs=ActionBarSherlock@6e3f2bb5,target=android-16,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:2.3.1,14,release-v2.3.1,srclibs=ActionBarSherlock@6e3f2bb5,target=android-16,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:2.4.1,16,release-v2.4.1,srclibs=ActionBarSherlock@4.3.1,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:2.5,17,!missing api keys release-v2.5,srclibs=ActionBarSherlock@4.4.0,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:2.1,11
+    commit=b156ba
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:2.2,12
+    commit=57aaf2
+    target=android-16
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:2.3.1,14
+    commit=release-v2.3.1
+    target=android-16
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:2.4.1,16
+    commit=release-v2.4.1
+    srclibs=ActionBarSherlock@4.3.1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:2.5,17
+    disable=missing api keys release-v2.5
+    commit=unknown - see disabled
+    srclibs=ActionBarSherlock@4.4.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.5
-Current Version Code:17
+Current Version:2.5.1
+Current Version Code:18
 
diff --git a/metadata/com.sam.hex.txt b/metadata/com.sam.hex.txt
index 9bfe78f484..3830378d68 100644
--- a/metadata/com.sam.hex.txt
+++ b/metadata/com.sam.hex.txt
@@ -1,4 +1,5 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:NCSA
 Web Site:https://xlythe.github.com/HexGame_Android
 Source Code:https://github.com/Xlythe/HexGame_Android
@@ -10,22 +11,29 @@ Description:
 Hex is a simple board game where two players race to connect their sides of 
 the board. 
 The winner is the first to build a solid path connecting their two sides. 
-If you find it too easy try the other AI opponent ;-)
+
+Newer versions of this app use the non-free Google Play Services library.
 .
 
 Repo Type:git
 Repo:https://github.com/Xlythe/HexGame_Android.git
 
-Build Version:2.2,13,900717,target=android-15
-Build Version:2.3,14,ed1053230e77e13a,target=android-15
-Build Version:2.4.1,16,8b6bdfde,target=android-17,\
-srclibs=ActionBarSherlock@4.3.1,prebuild=\
-printf 'android.library.reference.1=$$ActionBarSherlock$$' >> project.properties
+Build:2.2,13
+    commit=900717
+    target=android-15
+
+Build:2.3,14
+    commit=ed1053230e77e13a
+    target=android-15
+
+Build:3.0.2,22
+    commit=2010ac7d1a1ab
+    disable=Uses GMS
+    target=android-17
+    srclibs=1:ActionBarSherlock@4.4.0
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:2.4.1
-Current Version Code:16
-
-No Source Since:3.0.2
+Update Check Mode:RepoManifest
+Current Version:3.0.2
+Current Version Code:22
 
diff --git a/metadata/com.sandeel.bushidoblocks.txt b/metadata/com.sandeel.bushidoblocks.txt
index 0347afb452..3be45f3f28 100644
--- a/metadata/com.sandeel.bushidoblocks.txt
+++ b/metadata/com.sandeel.bushidoblocks.txt
@@ -1,4 +1,5 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:GPLv3
 Web Site:
 Source Code:https://github.com/sandeel/Bushido-Blocks
@@ -38,7 +39,6 @@ rm armeabi/libgdx-audio.so armeabi-v7a/libgdx-audio.so
 # Can use this if libgdx libraries can be confirmed
 # Putting unzip in build= doesn't seem to work nor does this
 #Build Version:1.4,14,25c7009d3989,patch=swarm.patch,\
-#scanignore=build/com.sandeel.bushidoblocks/,\
 #init=rm libs/Google*.jar && zip -r libgdx.zip libs/arm*,srclibs=MobAdMob@2d5736,\
 #subdir=bushido-blocks-android,prebuild=\
 #sed -i 's@\(reference.1=\).*@\1$$MobAdMob$$@;/merger/d' project.properties && \
diff --git a/metadata/com.sapos_aplastados.game.clash_of_balls.txt b/metadata/com.sapos_aplastados.game.clash_of_balls.txt
new file mode 100644
index 0000000000..7f22b13fc7
--- /dev/null
+++ b/metadata/com.sapos_aplastados.game.clash_of_balls.txt
@@ -0,0 +1,53 @@
+Categories:Games
+License:GPLv3
+Web Site:https://github.com/bkueng/clash_of_balls
+Source Code:https://github.com/bkueng/clash_of_balls
+Issue Tracker:https://github.com/bkueng/clash_of_balls/issues
+
+Auto Name:Clash of Balls
+Summary:2-player accelerometer game
+Description:
+Prove your sensitive control skills and compete with your friends over WiFi in 
+various levels. 
+Try to destroy your rivals by pushing them into the black void and become the 
+true master of balls. 
+Don't forget to make use of the mighty power-ups that will appear eventually. 
+And always be aware of the danger that you have to face out there. 
+But remember, you are alone and there is only one survivor.
+
+Games are played peer-to-peer; so
+no server is used, but each player needs to be in the same network to see each
+other. If the device supports it, Clash of Balls should also run via Bluetooth.
+For the best game experience, the WiFi needs low latencies. 
+You can also create a Hotspot and let others connect.
+
+The aim of the game is to bounce the other players out of the field by balancing
+your device.The game should be self-explanatory, there is a Help Menu. When the 
+game starts and the countdown is shown, hold your device still in the desired 
+position, where your ball should not move. During the game, tilt the device to 
+move your player to a certain direction.
+
+For physics simulation, JBox2D is used, a Java implementation of the 2D physics
+engine Box2D.
+.
+
+Repo Type:git
+Repo:https://github.com/bkueng/clash_of_balls.git
+
+Build:1.11,111
+    commit=v1.11
+    srclibs=Jbox2d@691
+    init=zip -r native.zip libs/armeabi
+    rm=libs/jbox2d-library-2.1.2.1-SNAPSHOT.jar
+    prebuild=echo 'source.dir=src;$$Jbox2d$$/src/main/java' >> ant.properties
+    build=unzip native.zip
+
+Maintainer Notes:
+Could build the alljoyn native library: https://git.allseenalliance.org/gerrit/
+.
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.11
+Current Version Code:111
+
diff --git a/metadata/com.scar45.aokp.co.webviewer.txt b/metadata/com.scar45.aokp.co.webviewer.txt
new file mode 100644
index 0000000000..434113c12f
--- /dev/null
+++ b/metadata/com.scar45.aokp.co.webviewer.txt
@@ -0,0 +1,26 @@
+Categories:Internet
+License:GPLv3
+Web Site:http://aokp.co
+Source Code:https://github.com/scar45/aokp-co-webviewer
+Issue Tracker:https://github.com/scar45/aokp-co-webviewer/issues
+Donate:http://aokp.co/donate
+
+Auto Name:AOKP.co
+Summary:Wrapper for AOKP website
+Description:
+AOKP is a custom ROM; there you get access to galleries and
+screenshots.
+.
+
+Repo Type:git
+Repo:https://github.com/scar45/aokp-co-webviewer.git
+
+Build:1.0,2
+    commit=37060d46ce49
+    update=force
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:2
+
diff --git a/metadata/com.scottmain.android.searchlight.txt b/metadata/com.scottmain.android.searchlight.txt
index 3018d80a4d..f1a61de45f 100644
--- a/metadata/com.scottmain.android.searchlight.txt
+++ b/metadata/com.scottmain.android.searchlight.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/search-light/
-Source Code:http://code.google.com/p/search-light/source/checkout
-Issue Tracker:http://code.google.com/p/search-light/issues/list
+Source Code:http://code.google.com/p/search-light/source
+Issue Tracker:http://code.google.com/p/search-light/issues
 
 Auto Name:Search Light
 Summary:LED Flashlight
@@ -20,8 +20,7 @@ Build Version:1.0,1,2
 Build Version:1.3,4,4,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3
 Current Version Code:4
 
diff --git a/metadata/com.seafile.seadroid.txt b/metadata/com.seafile.seadroid.txt
index 62652c5492..18b0b025f4 100644
--- a/metadata/com.seafile.seadroid.txt
+++ b/metadata/com.seafile.seadroid.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://seafile.com/en/download/
 Source Code:https://github.com/haiwen/seadroid
-Issue Tracker:https://github.com/haiwen/seadroid
+Issue Tracker:https://github.com/haiwen/seadroid/issues
 
 Auto Name:Seafile
 Summary:File synchronization
diff --git a/metadata/com.seafile.seadroid2.txt b/metadata/com.seafile.seadroid2.txt
index 26617112e7..6afbc27aba 100644
--- a/metadata/com.seafile.seadroid2.txt
+++ b/metadata/com.seafile.seadroid2.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://seafile.com/en/download/
 Source Code:https://github.com/haiwen/seadroid
-Issue Tracker:https://github.com/haiwen/seadroid
+Issue Tracker:https://github.com/haiwen/seadroid/issues
 
 Auto Name:Seafile
 Summary:File synchronization
@@ -13,22 +13,22 @@ and invite other team members.
 Team members can then maintain file libraries together and collaborate
 around them.
 
-You can try the [http://seafile.cc/demo demo], sign up for an account
+You can try the [https://seacloud.cc/demo demo], sign up for an account
 at the website, or since the server-side is also free-as-in-freedom, it can be
 installed on any server and configured to work with the app.
 .
 
-Build Version:0.6.1,10,!one error; only guessing at library at 0.6.1,\
-srclibs=ActionBarSherlock@4.2.0;aFileChooser@bd54d1411f;NewQuickAction3D@f2b7b069547b;\
-HttpRequest-Sawicki@http-request-5.4.1,\
-prebuild=sed -i -e 's@\.1=.*@.1=$$ActionBarSherlock$$@' -e 's@\.2=.*@.2=$$aFileChooser$$@' \
-             -e 's@\.3=.*@.3=$$NewQuickAction3D$$@' project.properties && \
-         printf 'source.dir=src;$$HttpRequest-Sawicki$$' >> ant.properties && \
+Repo Type:git
+Repo:https://github.com/haiwen/seadroid.git
+
+Build Version:0.7.1,12,0.7.1,\
+srclibs=1:ActionBarSherlock@4.4.0;2:aFileChooser@bd54d1411f;3:NewQuickAction3D-haiwen@master;\
+HttpRequest-Sawicki@http-request-5.3,\
+prebuild=echo 'source.dir=src;$$HttpRequest-Sawicki$$' >> ant.properties && \
          cp libs/android-support-v4.jar $$aFileChooser$$/libs/android-support-v4.jar
 
 Auto Update Mode:None
-# started to use tags; also on gplay
-Update Check Mode:RepoManifest
-Current Version:0.6.1
-Current Version Code:10
+Update Check Mode:None
+Current Version:0.7.1
+Current Version Code:12
 
diff --git a/metadata/com.seavenois.tetris.txt b/metadata/com.seavenois.tetris.txt
index 1ad7f53d1e..23602ab2cb 100644
--- a/metadata/com.seavenois.tetris.txt
+++ b/metadata/com.seavenois.tetris.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/tttris/
-Source Code:http://code.google.com/p/tttris/source/checkout
-Issue Tracker:http://code.google.com/p/tttris/issues/list
+Source Code:http://code.google.com/p/tttris/source
+Issue Tracker:http://code.google.com/p/tttris/issues
 
 Auto Name:Tttris
 Summary:Tetris clone for Android
diff --git a/metadata/com.seawolfsanctuary.keepingtracks.txt b/metadata/com.seawolfsanctuary.keepingtracks.txt
index 68769ecdf2..b6ed00c6ed 100644
--- a/metadata/com.seawolfsanctuary.keepingtracks.txt
+++ b/metadata/com.seawolfsanctuary.keepingtracks.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://keepingtracks.seawolfsanctuary.com
 Source Code:http://code.seawolfsanctuary.com/keepingtracks
@@ -35,25 +35,56 @@ Permissions:
 Repo Type:git
 Repo:https://bitbucket.org/sea_wolf/keepingtracks.git
 
-Build Version:1.01,20130223,!Far too old (upgrade still supported)
-Build Version:1.02,20130323,!Mistake in database schema upgrade
-Build Version:1.03,20130421,1.03,prebuild=rm -rf sources,target=android-10
-Build Version:1.04,20130727,1.04,\
-target=android-16,\
-srclibs=ActionBarSherlock@071a61c;HoloEverywhere@v1.6.8,\
-prebuild=rm -rf sources && sed -i 's@\(.1=\).*@\1$$HoloEverywhere$$@' project.properties && \
-         sed -i 's@\(.2=\).*@\1../srclib/HoloEverywhere/addons/preferences@' project.properties && \
-         sed -i 's@\(.3=\).*@\1../srclib/HoloEverywhere/addons/slider@' project.properties && \
-         sed -i 's@\(.4=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/preferences && \
-         $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/slider && \
-         sed -i 's@\(.1=\).*@\1../../ActionBarSherlock/actionbarsherlock@' \
-           $$HoloEverywhere$$/project.properties && \
-         mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+Build:1.01,20130223
+    disable=Far too old (upgrade still supported)
+    commit=unknown - see disabled
+
+Build:1.02,20130323
+    disable=Mistake in database schema upgrade
+    commit=unknown - see disabled
+
+Build:1.03,20130421
+    commit=1.03
+    target=android-10
+    prebuild=rm -rf sources
+
+Build:1.04,20130727
+    commit=1.04
+    target=android-16
+    srclibs=ActionBarSherlock@071a61c;HoloEverywhere@v1.6.8
+    prebuild=rm -rf sources && \
+        sed -i 's@\(.1=\).*@\1$$HoloEverywhere$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1../srclib/HoloEverywhere/addons/preferences@' project.properties && \
+        sed -i 's@\(.3=\).*@\1../srclib/HoloEverywhere/addons/slider@' project.properties && \
+        sed -i 's@\(.4=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/preferences && \
+        $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/slider && \
+        sed -i 's@\(.1=\).*@\1../../ActionBarSherlock/actionbarsherlock@' $$HoloEverywhere$$/project.properties && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:1.05,20131113
+    commit=1.05
+    target=android-16
+    srclibs=ActionBarSherlock@071a61c;HoloEverywhere@v1.6.8
+    prebuild=rm -rf sources && \
+        sed -i 's@\(.1=\).*@\1$$HoloEverywhere$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1../srclib/HoloEverywhere/addons/preferences@' project.properties && \
+        sed -i 's@\(.3=\).*@\1../srclib/HoloEverywhere/addons/slider@' project.properties && \
+        sed -i 's@\(.4=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/preferences && \
+        $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/slider && \
+        sed -i 's@\(.1=\).*@\1../../ActionBarSherlock/actionbarsherlock@' $$HoloEverywhere$$/project.properties && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Maintainer Notes:
+A comment saying "possibly use ABS-Prototik srclib next time" was added to this
+metadata previously, with no further explanation. The ABS commit referenced
+above is also specifically referenced in the project.properties (as is the
+HoloEverywhere version).
+.
 
-# possibly use ABS-Prototik srclib next time
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.04
-Current Version Code:20130727
+Current Version:1.05
+Current Version Code:20131113
 
diff --git a/metadata/com.seb.SLWP.txt b/metadata/com.seb.SLWP.txt
index 019d4612cb..ccbe2830c7 100644
--- a/metadata/com.seb.SLWP.txt
+++ b/metadata/com.seb.SLWP.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPL/Artistic
 Web Site:http://code.google.com/p/earth-live-wallpaper/
-Source Code:http://code.google.com/p/earth-live-wallpaper/source/checkout
-Issue Tracker:http://code.google.com/p/earth-live-wallpaper/issues/list
+Source Code:http://code.google.com/p/earth-live-wallpaper/source
+Issue Tracker:http://code.google.com/p/earth-live-wallpaper/issues
 
 Auto Name:EarthRot
 Summary:Rotating planets wallpaper
@@ -15,11 +15,19 @@ Repo Type:git-svn
 # Note the starting space in a subdir name
 Repo:http://earth-live-wallpaper.googlecode.com/svn/trunk/%20earth-live-wallpaper/SLWP
 
-Build Version:1.4,60,61,target=android-10,init=rm -rf bin/ gen/,\
-patch=scoping-fix.patch;handle-no-market.patch;fix-appname.patch;button-name.patch
+Build:1.4,60
+    commit=61
+    init=rm -rf bin/ gen/
+    target=android-10
+    patch=scoping-fix.patch;handle-no-market.patch;fix-appname.patch;button-name.patch
+
+Build:1.5,61
+    commit=62
+    disable=patches need updating
+    target=android-10
+    patch=scoping-fix.patch;handle-no-market.patch;fix-appname.patch;button-name.patch
 
 Auto Update Mode:None
-# Had a problem using RM: maybe the url encoding
 Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:61
diff --git a/metadata/com.seb.SLWPmaps.txt b/metadata/com.seb.SLWPmaps.txt
index 6deb99138b..b0c67dff01 100644
--- a/metadata/com.seb.SLWPmaps.txt
+++ b/metadata/com.seb.SLWPmaps.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPL/Artistic
 Web Site:http://code.google.com/p/earth-live-wallpaper/
-Source Code:http://code.google.com/p/earth-live-wallpaper/source/checkout
-Issue Tracker:http://code.google.com/p/earth-live-wallpaper/issues/list
+Source Code:http://code.google.com/p/earth-live-wallpaper/source
+Issue Tracker:http://code.google.com/p/earth-live-wallpaper/issues
 
 Name:Earth Live Wallpaper: Map Pack
 Auto Name:Map Pack -- Earth Live Wallpaper
@@ -12,15 +12,13 @@ If you find that you end up with a blank planet in [[com.seb.SLWP]]
 try installing this.
 .
 
-Repo Type:svn
-# Note the starting space in a subdir name
+Repo Type:git-svn
 Repo:http://earth-live-wallpaper.googlecode.com/svn/trunk/%20earth-live-wallpaper/SLWP_Maps
 
 Build Version:1.0,2,44,target=android-10
 
 Auto Update Mode:None
-# Had a problem using RM: maybe the url encoding
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:2
 
diff --git a/metadata/com.serone.desktoplabel.txt b/metadata/com.serone.desktoplabel.txt
index 15935a5d06..f26cd168a7 100644
--- a/metadata/com.serone.desktoplabel.txt
+++ b/metadata/com.serone.desktoplabel.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://code.google.com/p/desktoplabel/
-Source Code:http://code.google.com/p/desktoplabel/source/checkout
-Issue Tracker:http://code.google.com/p/desktoplabel/issues/list
+Source Code:http://code.google.com/p/desktoplabel/source
+Issue Tracker:http://code.google.com/p/desktoplabel/issues
 
 Auto Name:DesktopLabel
 Summary:Custom desktop label widgets
@@ -10,14 +10,14 @@ Description:
 Allows you to add custom widgets to your 'desktop' to label things.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://desktoplabel.googlecode.com/svn/DesktopLabel
 
-Build Version:1.4.0,7,16
+Build:1.4.0,7
+    commit=16
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.3.0
-Current Version Code:6
+Update Check Mode:RepoManifest
+Current Version:1.4.0
+Current Version Code:7
 
diff --git a/metadata/com.sgr_b2.compass.txt b/metadata/com.sgr_b2.compass.txt
new file mode 100644
index 0000000000..d29af07ac9
--- /dev/null
+++ b/metadata/com.sgr_b2.compass.txt
@@ -0,0 +1,51 @@
+Categories:Navigation
+License:GPLv3+
+Web Site:
+Source Code:https://bitbucket.org/alekseyt/compass
+Issue Tracker:https://bitbucket.org/alekseyt/compass/issues
+
+Auto Name:Community compass
+Summary:Feature Compass
+Description:
+An outdoors application which can help you to find your way though the
+forest or desert, or whatever. It provides inter-device location exchange
+by SMS and can make distress call even if the device screen is broken by
+sending SMS with your location on your behalf.
+
+Due to pointer-navigation nature, it can also be used as either magnetic
+or GPS compass reading direction to north from your device magnetic
+sensors or from GPS chip.
+
+[https://bitbucket.org/alekseyt/compass/src/master/CHANGELOG CHANGELOG]
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/alekseyt/compass.git
+
+Build:1.3.4,14
+    commit=cb048fb
+    submodules=yes
+    buildjni=no
+
+Build:1.3.5,15
+    commit=1.3.5
+    submodules=yes
+    buildjni=no
+
+Build:1.4,16
+    commit=1.4
+    submodules=yes
+    target=android-19
+    buildjni=no
+
+Build:1.4.1,17
+    commit=1.4.1
+    submodules=yes
+    target=android-19
+    buildjni=no
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.4.1
+Current Version Code:17
+
diff --git a/metadata/com.shahul3d.indiasatelliteweather.txt b/metadata/com.shahul3d.indiasatelliteweather.txt
new file mode 100644
index 0000000000..b28fe6a774
--- /dev/null
+++ b/metadata/com.shahul3d.indiasatelliteweather.txt
@@ -0,0 +1,36 @@
+AntiFeatures:UpstreamNonFree
+Categories:Science & Education
+License:GPL
+Web Site:
+Source Code:https://github.com/Shahul3D/IndiaSatelliteWeather
+Issue Tracker:https://github.com/Shahul3D/IndiaSatelliteWeather/issues
+
+Auto Name:India Satellite Weather
+Summary:Satellite weather maps
+Description:
+"A picture is worth a thousand words". 
+A complex weather data can be conveyed with a single image map. 
+By observing the cloud formations around your City, you can predict 
+whether the day is going to be Hot or Rainy/Cloudy.
+
+The app fetches the weather data directly from the Official Indian Government 
+[http://www.imd.gov.in webpage] for "satellite Images & Products" 
+
+A couple of proprietary libraries were removed.
+.
+
+Repo Type:git
+Repo:https://github.com/Shahul3D/IndiaSatelliteWeather.git
+
+Build:1.0,1
+    commit=7cf0caf69fcb
+    rm=libs/libGoogleAnalyticsServices.jar;libs/crashlytics.jar;res/values/com_crashlytics_export_strings.xml
+    srclibs=1:NoAnalytics@869751616e7;ImageViewTouch@221fc68f17;Easing@a264e
+    prebuild=find src -type f -print0 | xargs -0 sed -i '/Crashlytics/d' && \
+        echo 'source.dir=src;$$ImageViewTouch$$/src;$$Easing$$/src/main/java' > ant.properties
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.0 Beta
+Current Version Code:2
+
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index 54e689ee28..5d8175de65 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -1,5 +1,5 @@
-AntiFeatures:Tracking
-Category:Navigation
+AntiFeatures:Tracking,UpstreamNonFree
+Categories:Navigation
 License:GPLv3
 Web Site:https://github.com/ShowMeHills/ShowMeHills/wiki
 Source Code:https://github.com/ShowMeHills/ShowMeHills
diff --git a/metadata/com.shurik.droidzebra.txt b/metadata/com.shurik.droidzebra.txt
index c83d44947c..55a4585ea2 100644
--- a/metadata/com.shurik.droidzebra.txt
+++ b/metadata/com.shurik.droidzebra.txt
@@ -1,17 +1,17 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/droidzebra/
-Source Code:http://code.google.com/p/droidzebra/source/checkout
-Issue Tracker:http://code.google.com/p/droidzebra/issues/list
+Source Code:http://code.google.com/p/droidzebra/source
+Issue Tracker:http://code.google.com/p/droidzebra/issues
 Donate:http://droidzebra.appspot.com/droidzebra/donate
 
 Auto Name:DroidZebra
 Summary:Reversi game
 Description:
 DroidZebra is advanced Reversi program based on Zebra Othello Engine written by Gunnar Andersson. Features:
-- difficulty levels from beginner (practice mode) to world-class play
-- opening book with more than 500,000 positions
-- unlimited undo
+* difficulty levels from beginner (practice mode) to world-class play
+* opening book with more than 500,000 positions
+* unlimited undo
 .
 
 Repo Type:git
@@ -21,8 +21,7 @@ Build Version:1.4,10,1e08eec,subdir=project,buildjni=yes
 Build Version:1.4.1,12,d2e47f982c30,subdir=project,buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4.1
 Current Version Code:12
 
diff --git a/metadata/com.sigseg.android.worldmap.txt b/metadata/com.sigseg.android.worldmap.txt
index 79b443bf3e..e3b9b5addd 100644
--- a/metadata/com.sigseg.android.worldmap.txt
+++ b/metadata/com.sigseg.android.worldmap.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:https://github.com/johnnylambada/WorldMap
 Source Code:https://github.com/johnnylambada/WorldMap
diff --git a/metadata/com.silentlexx.instead.txt b/metadata/com.silentlexx.instead.txt
index c0170d6318..8cb6dd9316 100644
--- a/metadata/com.silentlexx.instead.txt
+++ b/metadata/com.silentlexx.instead.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://instead.syscall.ru/
 Source Code:http://sourceforge.net/p/instead/code/
@@ -17,7 +17,7 @@ choosen language.
 [http://sf.net/p/instead/wiki/ChangeLog/ Changelog]
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://instead-android.googlecode.com/svn/trunk/
 
 Build Version:1.6.1.9,16109,r44,buildjni=yes,subdir=project,\
@@ -26,6 +26,6 @@ init=echo -e "APP_CFLAGS += -D__ARM_ARCH_5__" > jni/Application.mk && cd .. && .
 prebuild=ln -s `readlink -f $$INSTEAD$$` jni/src/instead
 
 Auto Update Mode:None
-Update Check Mode:AndroidManifest
+Update Check Mode:RepoManifest
 Current Version:1.6.1.9
 Current Version Code:16109
diff --git a/metadata/com.sinpo.xnfc.txt b/metadata/com.sinpo.xnfc.txt
index 932e3697df..273102dfcb 100644
--- a/metadata/com.sinpo.xnfc.txt
+++ b/metadata/com.sinpo.xnfc.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/nfcard/
-Source Code:http://code.google.com/p/nfcard/source/checkout
-Issue Tracker:http://code.google.com/p/nfcard/issues/list
+Source Code:http://code.google.com/p/nfcard/source
+Issue Tracker:http://code.google.com/p/nfcard/issues
 
 Auto Name:NFCard
 Summary:Read info from cards
@@ -13,13 +13,12 @@ China. NFCard can read information like balance of account, transaction log, etc
 .
 
 Repo Type:git-svn
-Repo:http://nfcard.googlecode.com/svn/trunk/
+Repo:http://nfcard.googlecode.com/svn/trunk/nfcard
 
-Build Version:1.2.120228,1,12,subdir=nfcard,target=android-15
+Build Version:1.2.120228,1,12,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.120228
 Current Version Code:1
 
diff --git a/metadata/com.sismics.reader.txt b/metadata/com.sismics.reader.txt
new file mode 100644
index 0000000000..c3ba81e080
--- /dev/null
+++ b/metadata/com.sismics.reader.txt
@@ -0,0 +1,43 @@
+Categories:Reading
+License:GPL
+Web Site:http://www.sismics.com
+Source Code:https://github.com/sismics/reader
+Issue Tracker:https://github.com/sismics/reader/issues
+
+Auto Name:Sismics Reader
+Summary:Feed reader
+Description:
+Connect to your Sismics feed aggregator (in the same source code repo;
+it's also written in Java though prebuilts are available).
+.
+
+Repo Type:git
+Repo:https://github.com/sismics/reader.git
+
+Build:1.3.1,5
+    commit=3284254ca61539ac
+    subdir=reader-android
+    maven=yes
+    extlibs=android/android-support-v4r13.jar
+    prebuild=sed -i 's/3.5.3/3.6.1/g' pom.xml && \
+        $$MVN3$$ -N -Pinit validate && \
+        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r13 -Dpackaging=jar -Dfile=libs/android-support-v4r13.jar
+
+Build:1.3.2,6
+    commit=d76afd410c14a
+    subdir=reader-android
+    maven=yes
+    extlibs=android/android-support-v4r13.jar
+    prebuild=sed -i 's/3.5.3/3.6.1/g' pom.xml && \
+        $$MVN3$$ -N -Pinit validate && \
+        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r13 -Dpackaging=jar -Dfile=libs/android-support-v4r13.jar
+
+Maintainer Notes:
+Tags are probably for the server, they definitely don't correspond to client releases.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3.2
+Current Version Code:6
+
diff --git a/metadata/com.sli.ohmcalc.txt b/metadata/com.sli.ohmcalc.txt
new file mode 100644
index 0000000000..6ecfaf394c
--- /dev/null
+++ b/metadata/com.sli.ohmcalc.txt
@@ -0,0 +1,25 @@
+Categories:Science & Education
+License:AGPL
+Web Site:
+Source Code:https://github.com/sli/ohmcalc
+Issue Tracker:https://github.com/sli/ohmcalc/issues
+
+Auto Name:Ohm Calc
+Summary:For e-cigarette users
+Description:
+Simple app that calculates total resistance of your coils and lets you apply Ohm’s law to also 
+find amp draw and power output.
+.
+
+Repo Type:git
+Repo:https://github.com/sli/ohmcalc.git
+
+Build:0.1,1
+    commit=0.1
+    srclibs=1:ActionBarSherlock@4.4.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
+
diff --git a/metadata/com.smerty.ham.txt b/metadata/com.smerty.ham.txt
index 44abf0f49e..75c7868955 100644
--- a/metadata/com.smerty.ham.txt
+++ b/metadata/com.smerty.ham.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:NewBSD
 Web Site:https://github.com/Smerty/ham.android
 Source Code:https://github.com/Smerty/ham.android
@@ -13,7 +13,7 @@ If you have a non-premium (free) account on QRZ.com, you will only get the
 name and country of callsigns.
 We are looking at offering more callsign databases.
 Many free sources only contain US hams, which is of
-limited use for many of us.
+limited use for many users.
 .
 
 Repo Type:git
diff --git a/metadata/com.smorgasbork.hotdeath.txt b/metadata/com.smorgasbork.hotdeath.txt
index 3025ced86e..c057d2ac96 100644
--- a/metadata/com.smorgasbork.hotdeath.txt
+++ b/metadata/com.smorgasbork.hotdeath.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/hotdeath/
-Source Code:http://code.google.com/p/hotdeath/source/checkout
-Issue Tracker:http://code.google.com/p/hotdeath/issues/list
+Source Code:http://code.google.com/p/hotdeath/source
+Issue Tracker:http://code.google.com/p/hotdeath/issues
 
 Auto Name:Hot Death
 Summary:Card game
@@ -11,16 +11,15 @@ A variant of the classic card game Uno
 .
 
 Repo Type:git-svn
-Repo:http://hotdeath.googlecode.com/svn/trunk/
+Repo:http://hotdeath.googlecode.com/svn;trunk=trunk;tags=tags
 
 Build Version:1.0.2,3,26
 Build Version:1.0.5,6,34
 Build Version:1.0.6,7,36
-Build Version:1.0.7,8,38
+Build Version:1.0.7,8,release-1.0.7
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0.7
 Current Version Code:8
 
diff --git a/metadata/com.spazedog.mounts2sd.txt b/metadata/com.spazedog.mounts2sd.txt
new file mode 100644
index 0000000000..5edabefc10
--- /dev/null
+++ b/metadata/com.spazedog.mounts2sd.txt
@@ -0,0 +1,47 @@
+Categories:System
+License:GPLv3
+Web Site:http://forum.xda-developers.com/showthread.php?t=2432479
+Source Code:https://github.com/SpazeDog/mounts2sd
+Issue Tracker:https://github.com/SpazeDog/mounts2sd/issues
+
+Auto Name:Mounts2SD
+Summary:Map device storage to sdcard
+Description:
+'''N.B''' 'Fix sqlite3 binary' was removed in this build.
+
+Mounts2SD is a script for devices with low storage capabilities, but 
+It can be used for a lot of things and is useful on almost any device, even 
+those without external sdcard.
+
+The script itself has grown to become a large storage and management script 
+with features that control SWAP, ZRAM, mount optimization, storage 
+thresholds, different external and internal MMC configurations, cache and more. 
+The content management is able to move a lot more different content between /data and 
+/sd-ext, including the new internal storage, which on newer devices, is placed 
+in /data/media, and it also contains more than one option for storing system 
+content on both /data and /sd-ext. 
+
+Requires root.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/SpazeDog/mounts2sd
+
+Build:3.4.8,33
+    commit=3.4.8
+    rm=libs/rootfw3.jar;libs/taskmanager.jar;assets/busybox;assets/sqlite3
+    target=android-18
+    srclibs=1:RootFW@3_1.3.2;2:TaskManager@67ca5;Busybox@83785f0;BusyboxConfigs@bd2bf4f3
+    prebuild=mv libs/android-support-v4.jar $$TaskManager$$/libs && \
+        cp $$BusyboxConfigs$$/android_ndk_defconfigPlus $$Busybox$$/.config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" -C $$Busybox$$ && \
+        mv $$Busybox$$/busybox assets/busybox
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest/3.x
+Current Version:3.4.8
+Current Version Code:33
+
diff --git a/metadata/com.sputnik.wispr.txt b/metadata/com.sputnik.wispr.txt
index e87e0e7d71..a45839489e 100644
--- a/metadata/com.sputnik.wispr.txt
+++ b/metadata/com.sputnik.wispr.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/androidwisprclient/
-Source Code:http://code.google.com/p/androidwisprclient/source/checkout
-Issue Tracker:http://code.google.com/p/androidwisprclient/issues/list
+Source Code:http://code.google.com/p/androidwisprclient/source
+Issue Tracker:http://code.google.com/p/androidwisprclient/issues
 
 Summary:Auto connect to FON network
 Description:
diff --git a/metadata/com.studio332.flickit.txt b/metadata/com.studio332.flickit.txt
new file mode 100644
index 0000000000..0e98992dd0
--- /dev/null
+++ b/metadata/com.studio332.flickit.txt
@@ -0,0 +1,37 @@
+Categories:Games
+License:Apache2
+Web Site:https://www.facebook.com/studio332apps/info
+Source Code:https://github.com/louffoster/FlickIt
+Issue Tracker:https://github.com/louffoster/FlickIt/issues
+
+Auto Name:FlickIt!
+Summary:Family game of skill
+Description:
+It combines aspects of shuffleboard, 9-ball and bumper pool into a unique new 
+gameplay experience. 
+Use your shooter puck to knock white targets into the holes for points. 
+In 9-ball, the lowest numbered target must be hit first, but it doesn't matter
+which target is holed.
+
+FlickIt! is easy to learn, yet difficult to master. 
+Just drag your finger to aim, tap and hold to increase power, and release to 
+shoot. 
+Be careful you don't overpower and miss the shot!
+Challenge your friends to see who is the true FlickIt! master.
+.
+
+Repo Type:git
+Repo:https://github.com/louffoster/FlickIt.git
+
+Build:1.2,3
+    commit=59621a4ef5f9127
+    subdir=FlickIt-android
+    init=mv ../FlickIt/libs/gdx.jar libs/ && \
+         echo 'source.dir=src;../FlickIt/src' > ant.properties
+    scanignore=FlickIt-android/libs/armeabi/libgdx.so;FlickIt-android/libs/x86/libgdx.so;FlickIt-android/libs/armeabi-v7a/libgdx.so
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3
+
diff --git a/metadata/com.sweetiepiggy.everylocale.txt b/metadata/com.sweetiepiggy.everylocale.txt
index d4ad23ec53..6f7cf3d8af 100644
--- a/metadata/com.sweetiepiggy.everylocale.txt
+++ b/metadata/com.sweetiepiggy.everylocale.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://freecode.com/projects/every-locale
 Source Code:https://github.com/sweetiepiggy/Every-Locale
diff --git a/metadata/com.taiste.lainari_en.txt b/metadata/com.taiste.lainari_en.txt
new file mode 100644
index 0000000000..91710af0ac
--- /dev/null
+++ b/metadata/com.taiste.lainari_en.txt
@@ -0,0 +1,42 @@
+AntiFeatures:UpstreamNonFree
+Category:Office
+License:GPLv3
+Web Site:https://github.com/helsinki-city-library/pocketlibrary/wiki
+Source Code:https://github.com/helsinki-city-library/pocketlibrary
+Issue Tracker:https://github.com/helsinki-city-library/pocketlibrary/issues
+
+Name:Pocket Library
+Summary:Assistance for library users
+Description:
+Pocket Library is a new kind of a service for library patrons.
+
+The service expands the traditional notion of checking out materials, making it 
+possible for library users to check out books and other items directly from 
+other users anywhere.
+
+To be more generally useful as a library user’s personal information 
+assistant, it also has the ability to manage the user’s loans and explore the 
+library catalog.
+
+The service is currently tailored for Helsinki area public libraries’ catalog, 
+but can be easily adapted for anybody using MARC21 catalogs.
+
+A proprietary analytics library was removed.
+.
+
+Repo Type:git
+Repo:https://github.com/helsinki-city-library/pocketlibrary.git
+
+Build:1.5,18
+    commit=ad935f
+    disable=purge apk; assets need to be included from common somehow
+    subdir=android
+    init=rm LibraryProject/build.xml && echo -e "android.library=true\ntarget=android-12" > LibraryProject/project.properties
+    srclibs=NoAnalytics@c8d77
+    rm=android/libs/libGoogleAnalyticsV2.jar;iphone
+    prebuild=$$SDK$$/tools/android update project -l $$NoAnalytics$$ -p .
+
+Update Check Mode:RepoManifest
+Current Version:1.5
+Current Version Code:18
+
diff --git a/metadata/com.tastycactus.timesheet.txt b/metadata/com.tastycactus.timesheet.txt
index 414206eecf..8514f5c6c6 100644
--- a/metadata/com.tastycactus.timesheet.txt
+++ b/metadata/com.tastycactus.timesheet.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://tastycactus.com/projects/timesheet/
 Source Code:https://github.com/ambrice/timesheet
@@ -18,11 +18,10 @@ Repo Type:git
 Repo:https://github.com/ambrice/timesheet.git
 
 Build Version:1.4,5,b6fca7587d7340cf6f433362d9e30a732349d857
-Build Version:1.5,6,3a3a158cef5a6b59adcf8bd258e8bd257173cd15
+Build Version:1.5,6,v1.5
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.5
 Current Version Code:6
 
diff --git a/metadata/com.teamdc.stephendiniz.autoaway.txt b/metadata/com.teamdc.stephendiniz.autoaway.txt
index 11ade8cd50..44616315b9 100644
--- a/metadata/com.teamdc.stephendiniz.autoaway.txt
+++ b/metadata/com.teamdc.stephendiniz.autoaway.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:
 Source Code:https://github.com/DizzyThermal/Auto-Away
diff --git a/metadata/com.teeworlds.txt b/metadata/com.teeworlds.txt
new file mode 100644
index 0000000000..f7b104e3e3
--- /dev/null
+++ b/metadata/com.teeworlds.txt
@@ -0,0 +1,51 @@
+Categories:Games
+License:GPLv2+
+Web Site:https://www.teeworlds.com/
+Source Code:https://github.com/pelya/commandergenius
+Issue Tracker:https://github.com/pelya/commandergenius/issues
+
+Name:Teeworlds
+Summary:Fast-paced 2D arcade shooter
+Description:
+Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up 
+to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even 
+design your own maps!
+.
+
+# Upstream isn't particulary happy about "custom clients", so it is likely to be forever
+# buried in depths of commandergenius repository..
+Repo Type:srclib
+Repo:libsdl-android
+
+# some libraries, such as libandroid.so can't be rebuilt from included sources;
+# others, such as python.so may be recompiled (probably, better from srclibs)
+Build:0.6.2.15,6215
+    disable=build fails - submodules using ssh?
+    commit=a7d9626282f
+    subdir=project
+    submodules=yes
+    init=ln -fs teeworlds jni/application/src && \
+        sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \
+        sed -ri 's/exit 0//' ../copyAssets.sh && \
+        find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
+        cd jni && \
+        rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \
+        cd ../.. && \
+        ./changeAppSettings.sh -a
+    target=android-17
+    rm=project/jni/application/commandergenius/commandergenius/icotool
+    build=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
+        cd .. && \
+        ./build.sh release
+    buildjni=no
+
+Maintainer Notes:
+Tags and AndroidManifest are unusable. See website for upstream Teeworlds
+releases and look up Git history for actual updates.
+.
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.6.2.15
+Current Version Code:6215
+
diff --git a/metadata/com.teleca.jamendo.txt b/metadata/com.teleca.jamendo.txt
index 2e854ee4fb..f2e7eb4b7b 100644
--- a/metadata/com.teleca.jamendo.txt
+++ b/metadata/com.teleca.jamendo.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://telecapoland.github.com/jamendo-android/
 Source Code:http://github.com/telecapoland/jamendo-android
diff --git a/metadata/com.templaro.opsiz.aka.txt b/metadata/com.templaro.opsiz.aka.txt
index 982b2261fa..2032539efa 100644
--- a/metadata/com.templaro.opsiz.aka.txt
+++ b/metadata/com.templaro.opsiz.aka.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://code.google.com/p/androidomatic-keyer
-Source Code:https://code.google.com/p/androidomatic-keyer/source/list
-Issue Tracker:https://code.google.com/p/androidomatic-keyer/issues/list
+Source Code:https://code.google.com/p/androidomatic-keyer/source
+Issue Tracker:https://code.google.com/p/androidomatic-keyer/issues
 
 Name:Androidomatic Keyer
 Auto Name:AKA
@@ -14,11 +14,10 @@ This project enables ham radio operators to use their android phones as memory k
 Repo Type:hg
 Repo:https://code.google.com/p/androidomatic-keyer
 
-Build Version:1.0,10,7266db,target=android-7
+Build Version:1.0,10,1.0,target=android-7
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:10
 
diff --git a/metadata/com.ten15.diyfish.txt b/metadata/com.ten15.diyfish.txt
new file mode 100644
index 0000000000..d83ccd9146
--- /dev/null
+++ b/metadata/com.ten15.diyfish.txt
@@ -0,0 +1,26 @@
+Categories:System
+License:MIT
+Web Site:
+Source Code:https://github.com/awilliams/fish
+Issue Tracker:https://github.com/awilliams/fish/issues
+
+Auto Name:Fish
+Summary:Screensaver
+Description:
+Fish daydream. Need to enable daydreams first.
+.
+
+Repo Type:git
+Repo:https://github.com/awilliams/fish.git
+
+Build:1.0,2
+    commit=10089
+    subdir=DIYFish/src/main
+    target=android-19
+    prebuild=echo 'source.dir=java' >ant.properties
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:2
+
diff --git a/metadata/com.textuality.lifesaver2.txt b/metadata/com.textuality.lifesaver2.txt
index 974606f8c6..7b470aae18 100644
--- a/metadata/com.textuality.lifesaver2.txt
+++ b/metadata/com.textuality.lifesaver2.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:Apache2
 Web Site:http://www.tbray.org/ongoing/When/201x/2010/04/25/LifeSaver-Lessons
-Source Code:http://code.google.com/p/lifesaver/
-Issue Tracker:http://code.google.com/p/lifesaver/issues/list
+Source Code:http://code.google.com/p/lifesaver/source
+Issue Tracker:http://code.google.com/p/lifesaver/issues
 
 Auto Name:LifeSaver2
 Summary:SMS and call log backup/restore
@@ -18,10 +18,19 @@ code for the server isn't free anyway.
 Repo Type:git-svn
 Repo:http://lifesaver.googlecode.com/svn/trunk/
 
-Auto Update Mode:None
-#Build Version:1.0,3,!wait for client at 18,target=android-10,prebuild=rm -rf src/com/textuality/lifesaver
-#Probably won't offer a local version again, coming as it does, from a Google employee
-Update Check Mode:Static
-Current Version:1.0
-Current Version Code:3
+Build:1.0,3
+    disable=deleting bin build
+    target=android-10
+    prebuild=rm -rf src/com/textuality/lifesaver
+
+Build:2.2,6
+	commit=27
+    target=android-10
+	srclibs=Aerc@064c6f23aa09
+	prebuild=echo 'android.library.reference.1=$$Aerc$$' >> project.properties
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.2
+Current Version Code:6
 
diff --git a/metadata/com.th.XenonWallpapers.txt b/metadata/com.th.XenonWallpapers.txt
new file mode 100644
index 0000000000..56d0ebe8c0
--- /dev/null
+++ b/metadata/com.th.XenonWallpapers.txt
@@ -0,0 +1,46 @@
+Categories:Wallpaper
+License:GPLv2
+Web Site:http://www.xenonhd.com
+Source Code:https://github.com/TeamHorizon/android_packages_apps_XenonWallpapers
+Issue Tracker:https://github.com/TeamHorizon/android_packages_apps_XenonWallpapers/issues
+
+Auto Name:XenonHD Wallpapers
+Summary:10 geometric wallpapers
+Description:
+Just the unbranded wallpapers from the XenonHD ROM static wallpapers.
+They're designed for HDPI screens i.e. (800x480px) but they'd be
+OK on higher resolution too (even though the app won't allow you to 
+resize them).
+
+There is also an option to choose one of seven solid-ish colours.
+.
+
+Repo Type:git
+Repo:https://github.com/TeamHorizon/android_packages_apps_XenonWallpapers
+
+Build:1.1,2
+    commit=25c0587e89e32
+    init=sed -i 's/XenonHD /Pattern HDPI /g' res/values/strings.xml && \
+        sed -i 's/Xenon/Pattern HDPI /g' res/values-es/strings.xml
+    target=android-16
+    extlibs=android/android-support-v4r13.jar
+    prebuild=cd res/drawable-nodpi/ && \
+        rm wallpaper_5.jpg && \
+        rm wallpaper_6.jpg && \
+        rm wallpaper_7.jpg && \
+        rm wallpaper_8.png && \
+        rm wallpaper_9.png && \
+        rm wallpaper_10.png && \
+        rm wallpaper_11.png && \
+        rm wallpaper_12.png && \
+        rm wallpaper_14.jpg && \
+        rm wallpaper_15.jpg && \
+        rm wallpaper_16.jpg && \
+        rm wallpaper_17.png && \
+        rm wallpaper_2*.png
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.threedlite.livePolys.txt b/metadata/com.threedlite.livePolys.txt
index b31f3ebff8..e8a273d3cd 100644
--- a/metadata/com.threedlite.livePolys.txt
+++ b/metadata/com.threedlite.livePolys.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/threedliteguy/threedlite
 Source Code:https://github.com/threedliteguy/threedlite
diff --git a/metadata/com.threedlite.urforms.txt b/metadata/com.threedlite.urforms.txt
index d820162545..548928c581 100644
--- a/metadata/com.threedlite.urforms.txt
+++ b/metadata/com.threedlite.urforms.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/threedliteguy/urforms
 Source Code:https://github.com/threedliteguy/urforms
@@ -22,20 +22,6 @@ required and add a validation regex which is a field format. Save the changes an
 data from the menu. Select the form type from the list on the left. You can add a new entry or search
 existing entries using the criteria fields below the search button. From the search screen you can
 edit the entries.
-
-For Advanced users --
-
-Reference field types: One form field can point to a record in another form. In Form Manager, set a new
-field to "reference" data type, and enter the "referenced form name". Then on the other referenced form,
-check the "short desc" box on one or more fields. When entering data it will show a select button to
-select a record from the other form data. This allows a foreign key type of relationship.
-
-ReferencedBy type. The purpose of this field is to display a list of items that reference the current form.
-For example a list of people attending a meeting.
-
-The "Form Name Field Name" should be the name of the form that references this form, followed by a space,
-and then the name of the field on the other form that references this form. The sample data created on
-a new install has an example of a many-to-many relationship that can be created in this way.
 .
 
 Repo Type:git
diff --git a/metadata/com.threedlite.userhash.location.txt b/metadata/com.threedlite.userhash.location.txt
new file mode 100644
index 0000000000..4e11d8318b
--- /dev/null
+++ b/metadata/com.threedlite.userhash.location.txt
@@ -0,0 +1,29 @@
+Category:Navigation
+License:Apache2
+Web Site:
+Source Code:https://github.com/threedliteguy/UhLocationReportingService
+Issue Tracker:https://github.com/threedliteguy/UhLocationReportingService/issues
+
+Auto Name:UserHash Location Reporting Service
+Name:UserHash
+Summary:Location reporting and viewing
+Description:
+Requires a server piece (.war) to run on a server with a public IP. 
+Source for server piece also included at source code page. 
+Set up friends and family and view their location. 
+Can also set a short status with your location.
+Automatically uses cell network location to save battery unless you 
+specifically update GPS location or it is in the cache.
+Uses open street map data by default.
+.
+
+Repo Type:git
+Repo:https://github.com/threedliteguy/UhLocationReportingService.git
+
+Build Version:1.1,2,af74d5c7
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.tkjelectronics.balanduino.txt b/metadata/com.tkjelectronics.balanduino.txt
new file mode 100644
index 0000000000..de2c87e0a9
--- /dev/null
+++ b/metadata/com.tkjelectronics.balanduino.txt
@@ -0,0 +1,40 @@
+Categories:Development
+License:GPL
+Web Site:http://www.balanduino.net
+Source Code:https://github.com/TKJElectronics/BalanduinoAndroidApp
+Issue Tracker:https://github.com/TKJElectronics/BalanduinoAndroidApp/issues
+
+Auto Name:Balanduino
+Summary:Controller for a robot
+Description:
+For the [http://www.kickstarter.com/projects/tkjelectronics/balanduino-balancing-robot-kit Balanduino]:
+a kit for a fully-FOSS, arduino-compatible, balancing robot.
+
+There are two versions: one with usb OTG (for uploading firmware) and one without
+(for Android 2.2)
+.
+
+Repo Type:git
+Repo:https://github.com/TKJElectronics/BalanduinoAndroidApp.git
+
+Build:0.5.0-basic,1000050
+    commit=0.5.0
+    submodules=yes
+    gradle=basic
+    prebuild=sed -i "6,7d;45 i \\\tversionName = project.versionName + '-basic'" build.gradle
+
+Build:0.5.0-usb,1200050
+    commit=0.5.0
+    submodules=yes
+    gradle=usb
+    prebuild=sed -i "6,7d;49 i \\\tversionName = project.versionName + '-usb'" build.gradle
+
+Maintainer Notes:
+Uses runtime vercode changes, so no UCMs apply.
+.
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.5.0
+Current Version Code:1000050
+
diff --git a/metadata/com.tmarki.comicmaker.txt b/metadata/com.tmarki.comicmaker.txt
index 18ee651cc5..df62a22973 100644
--- a/metadata/com.tmarki.comicmaker.txt
+++ b/metadata/com.tmarki.comicmaker.txt
@@ -1,8 +1,9 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:GPLv3
 Web Site:http://www.tmarki.com/apps
-Source Code:http://code.google.com/p/android-rage-maker/source/list
-Issue Tracker:http://code.google.com/p/android-rage-maker/issues/list
+Source Code:http://code.google.com/p/android-rage-maker/source
+Issue Tracker:http://code.google.com/p/android-rage-maker/issues
 
 Auto Name:Rage Maker
 Summary:Comic strip maker
@@ -22,12 +23,20 @@ See the [http://code.google.com/p/android-rage-maker/wiki README] about usage.
 Repo Type:git
 Repo:https://code.google.com/p/android-rage-maker/
 
-Build Version:1.5.4,33,320cd3606747,srclibs=MobAdMob@2d5736;FinfAgent@v0.1,prebuild=\
-echo "android.library.reference.1=$$FinfAgent$$" >> project.properties && \
-echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
+Build:1.5.4,33
+    commit=320cd3606747
+    srclibs=MobAdMob@2d5736;FinfAgent@v0.1
+    prebuild=echo "android.library.reference.1=$$FinfAgent$$" >> project.properties && \
+        echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
+
+Maintainer Notes:
+Commits seem to have little connection to versions. Currently there is a 1.5.6
+on Google Play, no source code, and a 1.5.5 in git that materially changes
+nothing since 1.5.4.
+.
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Static
 Current Version:1.5.4
 Current Version Code:33
 
diff --git a/metadata/com.tnc.android.graphite.txt b/metadata/com.tnc.android.graphite.txt
index e4c033abea..7c28decf6a 100644
--- a/metadata/com.tnc.android.graphite.txt
+++ b/metadata/com.tnc.android.graphite.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:
 Source Code:https://github.com/tjoelsson/graphitoid
@@ -14,17 +14,15 @@ graphing server. Displays graphs and allows metrics filtering.
 Repo Type:git
 Repo:https://github.com/tjoelsson/graphitoid.git
 
-Build Version:2.1.0,4,!Resource errors for srclib at a9683ec7f6c,target=android-15,\
-srclibs=Tree-View-List@a483e46d495a;DateSlider@14,\
-prebuild=echo "android.library.reference.1=$$Tree-View-List$$" >> project.properties && \
-echo "android.library.reference.2=$$DateSlider$$" >> project.properties && \
-sed -i '/key/d' $$Tree-View-List$$/ant.properties
+Build:2.1.2,6
+    commit=a9683ec7f6c
+    target=android-15
+    srclibs=Tree-View-List@e3ff02613a2a;DateSlider@14
+    prebuild=echo "android.library.reference.1=$$Tree-View-List$$" >> project.properties && \
+        echo "android.library.reference.2=$$DateSlider$$" >> project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.1.1
-Current Version Code:5
-
-No Source Since:2.1.1
+Update Check Mode:RepoManifest
+Current Version:2.1.2
+Current Version Code:6
 
diff --git a/metadata/com.tobykurien.google_news.txt b/metadata/com.tobykurien.google_news.txt
new file mode 100644
index 0000000000..c8dab15165
--- /dev/null
+++ b/metadata/com.tobykurien.google_news.txt
@@ -0,0 +1,40 @@
+Categories:Internet
+License:MIT
+Web Site:https://plus.google.com/u/0/118226948467140990198/posts/YVNFmADvAs4
+Source Code:https://github.com/tobykurien/GoogleNews
+Issue Tracker:https://github.com/tobykurien/GoogleNews/issues
+
+Auto Name:GApps Browser
+Summary:Sandbox for web apps
+Description:
+This app started out as a way to view Google News on the author's phone 
+but now encompasses Google+, Google Maps etc. 
+The idea is to be able to access the Google web apps without having to log 
+into Google on your browser, so that you can browse privately. 
+It is a good way to access the Google webapps if you have an AOSP-based ROM 
+and reject the proprietary GApps.
+Also the webapps are less bandwidth and battery-hungry than their native
+counterparts.
+
+Links to external sites (such as news articles, etc.) will be opened in 
+a regular browser, thus keeping the Google authentication sandboxed in the app. 
+.
+
+Repo Type:git
+Repo:https://github.com/tobykurien/GoogleNews.git
+
+Build:1.8,8
+    commit=4fc415
+
+Build:1.9,9
+    commit=v1.9
+
+Build:1.11,11
+    commit=v1.11
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.11
+Current Version Code:11
+
diff --git a/metadata/com.tortuca.holoken.txt b/metadata/com.tortuca.holoken.txt
index 5659eae4df..8070ec59c0 100644
--- a/metadata/com.tortuca.holoken.txt
+++ b/metadata/com.tortuca.holoken.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://code.google.com/p/holoken/
-Source Code:https://code.google.com/p/holoken/source/checkout
-Issue Tracker:https://code.google.com/p/holoken/issues/list
+Source Code:https://code.google.com/p/holoken/source
+Issue Tracker:https://code.google.com/p/holoken/issues
 
 Auto Name:HoloKen
 Summary:KenKen game
@@ -15,16 +15,17 @@ arithmetic and challenge your mind. The goal is to fill in the entire grid
 with numbers while meeting the operation restrictions for each grid cage.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://holoken.googlecode.com/svn/trunk
 
-Build Version:1.1.1,11,4,target=android-16
+Build:1.1.1,11
+    commit=4
+    target=android-16
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.2
-Current Version Code:15
+Update Check Mode:RepoManifest
+Current Version:1.1.1
+Current Version Code:11
 
 No Source Since:1.2
 
diff --git a/metadata/com.totsp.bookworm.txt b/metadata/com.totsp.bookworm.txt
index 45159ef120..85fbf39ea0 100644
--- a/metadata/com.totsp.bookworm.txt
+++ b/metadata/com.totsp.bookworm.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:Apache2
 Web Site:http://code.google.com/p/and-bookworm/
-Source Code:http://code.google.com/p/and-bookworm/source/checkout
-Issue Tracker:http://code.google.com/p/and-bookworm/issues/list
+Source Code:http://code.google.com/p/and-bookworm/source
+Issue Tracker:http://code.google.com/p/and-bookworm/issues
 
 Auto Name:BookWorm
 Summary:Book collection manager
@@ -15,15 +15,14 @@ searching for them, or by direct form entry. You can rate and comment on each
 book. Once you have your book list, you can sort and filter it.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://and-bookworm.googlecode.com/svn/trunk
 
 Build Version:1.0.17,18,570
 Build Version:1.0.18,19,574
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.18
 Current Version Code:19
 
diff --git a/metadata/com.totsp.crossword.shortyz.txt b/metadata/com.totsp.crossword.shortyz.txt
index fdbd1a8185..ea3bbffdb7 100644
--- a/metadata/com.totsp.crossword.shortyz.txt
+++ b/metadata/com.totsp.crossword.shortyz.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/shortyz/
-Source Code:http://code.google.com/p/shortyz/source/checkout
-Issue Tracker:http://code.google.com/p/shortyz/issues/list
+Source Code:http://code.google.com/p/shortyz/source
+Issue Tracker:http://code.google.com/p/shortyz/issues
 
 Auto Name:Shortyz
 Summary:Crossword game
@@ -16,22 +16,36 @@ it does fix the problems earlier versions had with Android 4.1.
 Repo Type:hg
 Repo:https://code.google.com/p/shortyz/
 
-Build Version:3.1.0,30100,1ce970a00083,subdir=shortyz,target=android-11,prebuild=\
-	cd ../puzlib && mvn package && mv target/*.jar ../shortyz/libs && rm -rf target &&\
-	cd ../shortyz
-Build Version:3.1.7,30107,!No source code apparently
-Build Version:3.2.1,30201,0aa74b9d2bef,subdir=shortyz,target=android-11,prebuild=\
-	mkdir -p libs/ && rm -rf src/com/totsp/crossword/io/ src/com/totsp/crossword/puz/ && \
-	cd ../puzlib && mvn package &&\
-	mv target/*.jar ../shortyz/libs/ && rm -rf target &&\
-	cd ../shortyz
+Build:3.1.0,30100
+    commit=1ce970a00083
+    subdir=shortyz
+    target=android-11
+    prebuild=cd ../puzlib && \
+        mvn package && \
+        mv target/*.jar ../shortyz/libs && \
+        rm -rf target && cd ../shortyz
+
+Build:3.1.7,30107
+    disable=No source code apparently
+    commit=unknown - see disabled
+
+Build:3.2.1,30201
+    commit=0aa74b9d2bef
+    subdir=shortyz
+    target=android-11
+    prebuild=mkdir -p libs/ && \
+        rm -rf src/com/totsp/crossword/io/ src/com/totsp/crossword/puz/ && \
+        cd ../puzlib && \
+        mvn package && mv target/*.jar ../shortyz/libs/ && \
+        rm -rf target && cd ../shortyz
+
+Build:3.2.10,30210
+    commit=1ba821b4825c
+    subdir=shortyz
+    init=rm build.xml
 
 Auto Update Mode:None
-#Build Version:3.2.7,30207,!Can't find corresponding source
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:3.2.7
-Current Version Code:30207
-
-No Source Since:3.2.7
+Update Check Mode:RepoManifest
+Current Version:3.2.10
+Current Version Code:30210
 
diff --git a/metadata/com.traffar.game_of_life.txt b/metadata/com.traffar.game_of_life.txt
new file mode 100644
index 0000000000..88ea8cd1cd
--- /dev/null
+++ b/metadata/com.traffar.game_of_life.txt
@@ -0,0 +1,47 @@
+Categories:Games,Mathematics
+License:GPLv3
+Web Site:https://bitbucket.org/przemekr/game_of_life_agg
+Source Code:https://bitbucket.org/przemekr/game_of_life_agg/src
+Issue Tracker:https://bitbucket.org/przemekr/game_of_life_agg/issues
+
+Auto Name:Game of Life
+Summary:Conway's Game of Life simulation
+Description:
+Implementation of [http://en.wikipedia.org/wiki/Conway%27s_Game_of_Life Conway's Game of Life]
+with a nice user interface.
+
+Features include:
+* Easy to use, intuitive interface
+* Number of initial states to try out
+* Resize the universe and set the evolution speed
+.
+
+Repo Type:git
+Repo:https://bitbucket.org/przemekr/game_of_life_agg.git
+
+Build:20131217,1
+    commit=android20131217
+    subdir=android
+    init=cd jni/SDL && \
+        rm -rf src include SDL-2.0.1* && \
+        wget http://libsdl.org/release/SDL2-2.0.1.tar.gz && \
+        tar xf SDL2-2.0.1.tar.gz && \
+        ln -s SDL2-2.0.1/src . && \
+        ln -s SDL2-2.0.1/include .
+    buildjni=yes
+
+Build:0.2,2
+    commit=0.2
+    subdir=android
+    init=cd jni/SDL && \
+        rm -rf src include SDL-2.0.1* && \
+        wget http://libsdl.org/release/SDL2-2.0.1.tar.gz && \
+        tar xf SDL2-2.0.1.tar.gz && \
+        ln -s SDL2-2.0.1/src . && \
+        ln -s SDL2-2.0.1/include .
+    buildjni=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:0.2
+Current Version Code:2
diff --git a/metadata/com.traffar.oware.txt b/metadata/com.traffar.oware.txt
new file mode 100644
index 0000000000..f38577939c
--- /dev/null
+++ b/metadata/com.traffar.oware.txt
@@ -0,0 +1,37 @@
+Categories:Games
+License:GPLv3
+Web Site:https://bitbucket.org/przemekr/oware/wiki/Home
+Source Code:https://bitbucket.org/przemekr/oware/src
+Issue Tracker:https://bitbucket.org/przemekr/oware/issues
+
+Auto Name:Oware
+Summary:Oware -- abstract African board game
+Description:
+Oware is a board strategy game of African origin. Among its many names are Ayò,
+Awalé, Wari, Ouri, Ouril or Uril.
+
+Move Your seeds along the board and grab scores from the opponent pits. Check 
+[http://en.wikipedia.org/wiki/Oware] for the game rules. 
+
+Play with a friend or against a computer player.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/przemekr/oware
+
+Build:0.1,1
+    disable=hg checkout fails
+    commit=0.1
+    subdir=android
+    init=cd jni/SDL && \
+        rm -rf src include SDL-2.0.1* && \
+        wget http://libsdl.org/release/SDL2-2.0.1.tar.gz && \
+        tar xf SDL2-2.0.1.tar.gz && \
+        ln -s SDL2-2.0.1/src . && \
+        ln -s SDL2-2.0.1/include .
+    buildjni=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
diff --git a/metadata/com.tum.yahtzee.txt b/metadata/com.tum.yahtzee.txt
index 969cc6689d..7479b095e1 100644
--- a/metadata/com.tum.yahtzee.txt
+++ b/metadata/com.tum.yahtzee.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://github.com/MichaelE1000/yahtzee4android
 Source Code:https://github.com/MichaelE1000/yahtzee4android
diff --git a/metadata/com.tunes.viewer.txt b/metadata/com.tunes.viewer.txt
index dff9fb3b38..244de644fb 100644
--- a/metadata/com.tunes.viewer.txt
+++ b/metadata/com.tunes.viewer.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv2+
 Web Site:http://tunesviewer.sourceforge.net
 Source Code:https://bitbucket.org/LBryan/tunesviewer-android
diff --git a/metadata/com.u17od.upm.txt b/metadata/com.u17od.upm.txt
new file mode 100644
index 0000000000..2f29d8a55a
--- /dev/null
+++ b/metadata/com.u17od.upm.txt
@@ -0,0 +1,25 @@
+Category:System
+License:GPLv3
+Web Site:http://upm.sourceforge.net
+Source Code:https://github.com/adrian/upm-android
+Issue Tracker:https://github.com/adrian/upm-android/issues
+
+Auto Name:UPM
+Summary:Cross platform password manager
+Description:
+*Uses AES for database encryption
+*Database sync across multiple PCs/devices
+*Android, Windows and Mac OS X native feeling versions available
+*Fast account searching
+.
+
+Repo Type:git
+Repo:https://github.com/adrian/upm-android.git
+
+Build Version:1.14,15,v1.14
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.14
+Current Version Code:15
+
diff --git a/metadata/com.ubergeek42.WeechatAndroid.txt b/metadata/com.ubergeek42.WeechatAndroid.txt
index 9f7030591f..c4865bf960 100644
--- a/metadata/com.ubergeek42.WeechatAndroid.txt
+++ b/metadata/com.ubergeek42.WeechatAndroid.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/ubergeek42/weechat-android/wiki
 Source Code:https://github.com/ubergeek42/weechat-android
@@ -38,8 +38,7 @@ mvn clean package -f ../weechat-relay/pom.xml && mkdir -p libs/ && \
 mv ../weechat-relay/target/weechat-relay-0.8-SNAPSHOT.jar libs/
 
 Auto Update Mode:None
-# Tags can't find version info
-#Update Check Mode:Market
+# Tags lag behind, master often has pre-releases
 Update Check Mode:None
 Current Version:0.8-dev-b5
 Current Version Code:5
diff --git a/metadata/com.ubuntuone.android.files.txt b/metadata/com.ubuntuone.android.files.txt
index 6b543da74a..3e8721fecb 100644
--- a/metadata/com.ubuntuone.android.files.txt
+++ b/metadata/com.ubuntuone.android.files.txt
@@ -1,37 +1,52 @@
-AntiFeatures:NonFreeNet
-Category:Internet
+AntiFeatures:NonFreeNet,UpstreamNonFree
+Categories:Internet
 License:AGPLv3
 Web Site:https://one.ubuntu.com
 Source Code:https://code.launchpad.net/ubuntuone-android-files
 Issue Tracker:https://bugs.launchpad.net/ubuntuone-android-files
 
-Auto Name:Ubuntu One Files
+Auto Name: 
 Summary:File synchronisation
 Description:
 Client for Ubuntu One, an online storage service provided with the
 Ubuntu OS.
 
-The non-free Google Analytics library was removed.
+The proprietary Google Analytics library was removed from this build.
 
-Anti-feature:NonFreeNet. The Ubuntu One Files server is not open source.
+Anti-feature:NonFreeNet. The Ubuntu One Files server is proprietary software.
 .
 
 Repo Type:bzr
 Repo:lp:ubuntuone-android-files
 
-Build Version:1.2.7,460,460,srclibs=NoAnalytics@158a4a,\
-extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.1.jar;\
-oauth-signpost/signpost-commonshttp4-1.2.1.1.jar,prebuild=\
-sed -i 's@../../GreenDroid@Greendroid@g' build.xml && \
-sed -i 's@\(android.library.reference.1=\).*@\1Greendroid/GreenDroid/@' project.properties && \
-echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
-sed -i 's@executable="android"@executable="$$SDK$$/tools/android"@g' build.xml && \
-sed -i 's@android@$$SDK$$/tools/android@g' tools.sh && \
-sed -i '87\,108d' build.xml && ant setup
+Build:1.2.7,460
+    commit=460
+    extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.1.jar;oauth-signpost/signpost-commonshttp4-1.2.1.1.jar
+    srclibs=NoAnalytics@158a4a
+    prebuild=sed -i 's@../../GreenDroid@Greendroid@g' build.xml && \
+        sed -i 's@\(android.library.reference.1=\).*@\1Greendroid/GreenDroid/@' project.properties && \
+        echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
+        sed -i 's@executable="android"@executable="$$SDK$$/tools/android"@g' build.xml && \
+        sed -i 's@android@$$SDK$$/tools/android@g' tools.sh && \
+        sed -i '87,108d' build.xml && \
+        ant setup
+
+Build:1.2.8,470
+    commit=470
+    disable=needs fixing
+    extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.1.jar;oauth-signpost/signpost-commonshttp4-1.2.1.1.jar
+    srclibs=NoAnalytics@158a4a
+    target=android-10
+    prebuild=sed -i 's@../../GreenDroid@Greendroid@g' build.xml && \
+        sed -i 's@\(android.library.reference.1=\).*@\1Greendroid/GreenDroid/@' project.properties && \
+        echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties && \
+        sed -i 's@executable="android"@executable="$$SDK$$/tools/android"@g' build.xml && \
+        sed -i 's@android@$$SDK$$/tools/android@g' tools.sh && \
+        sed -i '87,108d' build.xml && \
+        ant setup
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.2.7
-Current Version Code:460
+Update Check Mode:RepoManifest
+Current Version:1.2.8
+Current Version Code:472
 
diff --git a/metadata/com.ultramegatech.ey.txt b/metadata/com.ultramegatech.ey.txt
new file mode 100644
index 0000000000..c66966e7d0
--- /dev/null
+++ b/metadata/com.ultramegatech.ey.txt
@@ -0,0 +1,25 @@
+Categories:Science & Education
+License:MIT
+Web Site:http://ultramegasoft.com
+Source Code:https://github.com/ultramega/elementary
+Issue Tracker:https://github.com/ultramega/elementary/issues
+Donate:http://ey.ultramegatech.com/donate
+
+Auto Name:Elementary
+Summary:Periodic table of elements
+Description:
+Tap the element to see info and access videos and
+Wikipedia articles.
+.
+
+Repo Type:git
+Repo:https://github.com/ultramega/elementary.git
+
+Build:0.1.5,6
+    commit=eecdec
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.1.5
+Current Version Code:6
+
diff --git a/metadata/com.umang.dashnotifier.txt b/metadata/com.umang.dashnotifier.txt
index 686850eeec..bd54e79adb 100644
--- a/metadata/com.umang.dashnotifier.txt
+++ b/metadata/com.umang.dashnotifier.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:
 Source Code:https://github.com/umanx/DashNotifier
@@ -14,20 +14,39 @@ of notifications from arbitrary apps on the lock screen.
 Repo Type:git
 Repo:https://github.com/umanx/DashNotifier
 
-Build Version:0.4,9,ecf73974a72cf,\
-extlibs=android/android-support-v4.jar,\
-srclibs=Crouton@1.8.1,\
-prebuild=\
-   sed -i 's@\(android.library.reference.1=\).*@\1$$Crouton$$@' project.properties && \
-   mkdir -p $$Crouton$$/libs/ && mv libs/android-support-v4.jar $$Crouton$$/libs/
-Build Version:0.41,10,81e2fdc7c5ff666afa73,\
-extlibs=android/android-support-v4.jar,srclibs=Crouton@1.8.1,\
-prebuild=\
-   sed -i 's@\(android.library.reference.1=\).*@\1$$Crouton$$@' project.properties && \
-   mkdir -p $$Crouton$$/libs/ && mv libs/android-support-v4.jar $$Crouton$$/libs/
+Build:0.4,9
+    commit=ecf73974a72cf
+    extlibs=android/android-support-v4.jar
+    srclibs=Crouton@1.8.1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$Crouton$$@' project.properties && \
+        mkdir -p $$Crouton$$/libs/ && \
+        mv libs/android-support-v4.jar $$Crouton$$/libs/
+
+Build:0.41,10
+    commit=81e2fdc7c5ff666afa73
+    extlibs=android/android-support-v4.jar
+    srclibs=Crouton@1.8.1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$Crouton$$@' project.properties && \
+        mkdir -p $$Crouton$$/libs/ && \
+        mv libs/android-support-v4.jar $$Crouton$$/libs/
+
+Build:0.45,13
+    commit=00c403efa01e751
+    srclibs=1:Crouton@1.8.1
+    prebuild=mkdir -p $$Crouton$$/libs/ && \
+        mv libs/android-support-v4.jar $$Crouton$$/libs/
+    scanignore=res/drawable-xhdpi
+
+Build:0.48,18
+    commit=3960c5c6f5d8383e
+    srclibs=1:Crouton@1.8.1
+	target=android-19
+    prebuild=mkdir -p $$Crouton$$/libs/ && \
+        mv libs/android-support-v4.jar $$Crouton$$/libs/
+    scanignore=res/drawable-xhdpi
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:0.41
-Current Version Code:10
+Current Version:0.48
+Current Version Code:18
 
diff --git a/metadata/com.unitedcoders.android.gpodroid.txt b/metadata/com.unitedcoders.android.gpodroid.txt
index 3a906a2a6d..4b9e0e5f90 100644
--- a/metadata/com.unitedcoders.android.gpodroid.txt
+++ b/metadata/com.unitedcoders.android.gpodroid.txt
@@ -1,5 +1,5 @@
 Disabled:Stopped being distributed elsewhere
-Category:Multimedia
+Categories:Multimedia
 License:EPLv1
 Web Site:http://united-coders.com/gpodroid
 Source Code:https://github.com/gpodder/GpodRoid
diff --git a/metadata/com.unleashyouradventure.swaccess.txt b/metadata/com.unleashyouradventure.swaccess.txt
new file mode 100644
index 0000000000..a2f0e580e3
--- /dev/null
+++ b/metadata/com.unleashyouradventure.swaccess.txt
@@ -0,0 +1,34 @@
+Categories:Reading
+License:GPLv3
+Web Site:http://unleashyouradventure.com
+Source Code:http://code.google.com/p/smashwords-access-for-android/source
+Issue Tracker:http://code.google.com/p/smashwords-access-for-android/issues
+
+Auto Name:Smashwords Access
+Summary:eBook shop
+Description:
+Unofficial app for smashwords.com, a purveyor of DRM-free and gratis ebooks.
+
+Books can be loaded directly from Cool reader, FBReader or Pageturner
+.
+
+Repo Type:git-svn
+Repo:http://smashwords-access-for-android.googlecode.com/svn/trunk/SmashwordsAccess
+
+Build:011 beta,11
+    commit=25
+    subdir=SmashwordsAccess
+    extlibs=jsoup/jsoup-1.7.2.jar
+    srclibs=1:ActionBarSherlock@4.4.0;Smashwords-API@51;Google-Gson@1163;ImageLoader-Novoda@imageloader-parent-1.5.0
+    prebuild=cp -r $$Smashwords-API$$/src/main/java/com/unleashyouradventure/swapi/ src/com/unleashyouradventure/ && \
+        cp -r $$ImageLoader-Novoda$$/src/main/java/com/novoda/ src/com/ && \
+        cp -r $$Google-Gson$$/src/main/java/com/google/ src/com/
+
+Build:012 beta,12
+    disable=not published
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:014 beta
+Current Version Code:14
+
diff --git a/metadata/com.uploadedlobster.PwdHash.txt b/metadata/com.uploadedlobster.PwdHash.txt
index 8a9dcc224c..710d523c56 100644
--- a/metadata/com.uploadedlobster.PwdHash.txt
+++ b/metadata/com.uploadedlobster.PwdHash.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:NewBSD
 Web Site:https://github.com/phw/Android-PwdHash
 Source Code:https://github.com/phw/Android-PwdHash
@@ -15,16 +15,32 @@ and compatible with [http://www.pwdhash.com pwdhash.com].
 Repo Type:git
 Repo:https://github.com/phw/Android-PwdHash.git
 
-Build Version:1.3.0,9,1.3.0
-Build Version:1.3.1,10,1.3.1
-Build Version:1.3.2,11,1.3.2
-Build Version:1.3.3,13,1.3.3
-Build Version:1.3.5,15,1.3.5
-Build Version:1.3.8,18,1.3.8
-Build Version:1.3.8.1,19,1.3.8.1
+Build:1.3.0,9
+    commit=1.3.0
+
+Build:1.3.1,10
+    commit=1.3.1
+
+Build:1.3.2,11
+    commit=1.3.2
+
+Build:1.3.3,13
+    commit=1.3.3
+
+Build:1.3.5,15
+    commit=1.3.5
+
+Build:1.3.8,18
+    commit=1.3.8
+
+Build:1.3.8.1,19
+    commit=1.3.8.1
+
+Build:1.3.9,20
+    commit=1.3.9
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.3.8.1
-Current Version Code:19
+Current Version:1.3.9
+Current Version Code:20
 
diff --git a/metadata/com.uraroji.garage.android.mp3recvoice.txt b/metadata/com.uraroji.garage.android.mp3recvoice.txt
index c29e12e038..ba1d32d998 100644
--- a/metadata/com.uraroji.garage.android.mp3recvoice.txt
+++ b/metadata/com.uraroji.garage.android.mp3recvoice.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:http://garage.uraroji.com/2011/03/03/android%E4%B8%8A%E3%81%A7%E3%81%AEmp3%E3%82%A8%E3%83%B3%E3%82%B3%E3%83%BC%E3%83%89%E3%81%AE%E3%82%B5%E3%83%B3%E3%83%97%E3%83%AB/
 Source Code:https://github.com/yhirano/Mp3VoiceRecorderSampleForAndroid
diff --git a/metadata/com.ushahidi.android.app.txt b/metadata/com.ushahidi.android.app.txt
index 93ff86f567..26c76118c8 100644
--- a/metadata/com.ushahidi.android.app.txt
+++ b/metadata/com.ushahidi.android.app.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:LGPL
 Web Site:https://github.com/ushahidi/Ushahidi_Android/
 Source Code:https://github.com/ushahidi/Ushahidi_Android
diff --git a/metadata/com.valleytg.oasvn.android.txt b/metadata/com.valleytg.oasvn.android.txt
index d5e8d4a51a..32dc1cb800 100644
--- a/metadata/com.valleytg.oasvn.android.txt
+++ b/metadata/com.valleytg.oasvn.android.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:LGPL
 Web Site:http://www.valleytg.com
 Source Code:http://www.valleytg.com
@@ -7,45 +7,30 @@ Issue Tracker:http://www.valleytg.com:8090/secure/Dashboard.jspa
 Auto Name:OASVN Pro
 Summary:Subversion for Android
 Description:
-Works for http:// https:// and svn:// repositories. svn+ssh:// is experimental and has been added recently.
-Currently supports all of the following svn operations: Checkout (Head or specify revision),
-Update, Commit, Export (Head or specify revision), Cleanup, and Revert. Also allows you to view remote
-repository revisions (you specify the number of revisions to retrieve) and see commit comments, author,
-date/time and all files changed, added, deleted, etc.
+Works for http:// https:// and svn:// repositories. svn+ssh:// is experimental
+and has been added recently.  Currently supports all of the following svn
+operations: Checkout (Head or specify revision), Update, Commit, Export (Head
+or specify revision), Cleanup, and Revert. Also allows you to view remote
+repository revisions (you specify the number of revisions to retrieve) and see
+commit comments, author, date/time and all files changed, added, deleted, etc.
 
-Working copies and exports of repositories are saved locally (all checked out files will go to your
-mountable storage: most of the time /mnt/sdcard/OASVN) so they could be edited on your device with an IDE such as Terminal IDE and then you can commit back to your repository!
+Working copies and exports of repositories are saved locally (all checked out
+files will go to your mountable storage: most of the time /mnt/sdcard/OASVN)
+so they could be edited on your device with an IDE such as Terminal IDE and
+then you can commit back to your repository.
 
-The most recent version adds svn export so you can make a local copy of your repository on your Android
-device without making a working svn copy. Also the revisions list now prompts for the number of revisions
-to retrieve from the remote server. Finally you can checkout or export specific revisions besides the
-head version.
-
-The interface has been reworked a bit to include a menu for some functions to clean up the main screen.
-Also improved is the German language support. Help is needed with French, Japanese and
-Russian translations: if you can help, there is more information at these links:
-
-[http://www.valleytg.com:8090/browse/OASVN-35 French]
-[http://www.valleytg.com:8090/browse/OASVN-15 Russian]
-[http://www.valleytg.com:8090/browse/OASVN-14 Japanese]
-
-Every precaution has been taken to ensure this works correctly, but please make sure to back up your
-repositories regularly!
-
-This project is only a couple of months old now and has been growing quickly. A
-[http://www.valleytg.com/jira JIRA] has been created to help keep the project moving along.
-svn+ssl is still experimental: please send any feedback using the Jira.
+The most recent version adds svn export so you can make a local copy of your
+repository on your Android device without making a working svn copy.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:guest:guest@http://www.valleytg.com/svn/open/oasvn/trunk/
 
 Build Version:1.0.9,10,84,target=android-15
 Build Version:1.0.10,11,126,target=android-15
 
 Auto Update Mode:None
-#Manual for now
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.10
 Current Version Code:11
 
diff --git a/metadata/com.veken0m.bitcoinium.txt b/metadata/com.veken0m.bitcoinium.txt
index 50973fa5dc..3e83d1ed62 100644
--- a/metadata/com.veken0m.bitcoinium.txt
+++ b/metadata/com.veken0m.bitcoinium.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/veken0m/bitcoinium
@@ -17,39 +17,65 @@ Description:
 Repo Type:git
 Repo:https://github.com/veken0m/bitcoinium.git
 
-Build Version:1.5.0,25,8ff51dea1,\
-srclibs=XChange@xchange-1.5.0;ActionBarSherlock@4.2.0,prebuild=rm -f libs/xchange* && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties,build=\
-sed -i '239\,266d' $$XChange$$/pom.xml && $$MVN3$$ clean package -f $$XChange$$/pom.xml && \
-mv $(find $$XChange$$ -name \*.jar) libs/
-Build Version:1.5.2,28,1a9b108d4b,\
-srclibs=ActionBarSherlock@4.2.0,init=git checkout develop,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.5.4,31,a392c5bf9,\
-srclibs=ActionBarSherlock@4.2.0;ColorPickerPreference@a6ffb91b1,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$ColorPickerPreference$$@' project.properties
-Build Version:1.5.5,32,!wait for 1.7.0 of XChange: see issue #8. May build using srclib=Rescu
-Build Version:1.6.0,33,v1.6.0,\
-srclibs=XChange@xchange-1.7.0;ActionBarSherlock@4.2.0;\
-ColorPickerPreference@a6ffb91b1,prebuild=rm -f libs/xchange* && \
-sed -i 's@\(reference.2=\).*@\1$$ColorPickerPreference$$@' project.properties && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties,build=\
-sed -i '253\,280d' $$XChange$$/pom.xml && $$MVN3$$ clean package -f $$XChange$$/pom.xml && \
-mv $(find $$XChange$$ -name \*.jar) libs/
-Build Version:1.7.1,41,v1.7.1,\
-srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae,\
-prebuild=\
-  echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-  echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
-Build Version:1.8.0,43,v1.8.0,\
-srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae,\
-prebuild=\
-  echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-  echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
+Build:1.5.0,25
+    commit=8ff51dea1
+    srclibs=XChange@xchange-1.5.0;ActionBarSherlock@4.2.0
+    prebuild=rm -f libs/xchange* && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+    build=sed -i '239,266d' $$XChange$$/pom.xml && \
+        $$MVN3$$ clean package -f $$XChange$$/pom.xml && \
+        mv $(find $$XChange$$ -name \*.jar) libs/
+
+Build:1.5.2,28
+    commit=1a9b108d4b
+    init=git checkout develop
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.5.4,31
+    commit=a392c5bf9
+    srclibs=ActionBarSherlock@4.2.0;ColorPickerPreference@a6ffb91b1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$ColorPickerPreference$$@' project.properties
+
+Build:1.5.5,32
+    disable=wait for 1.7.0 of XChange: see issue #8. May build using srclib=Rescu
+    commit=unknown - see disabled
+
+Build:1.6.0,33
+    commit=v1.6.0
+    srclibs=XChange@xchange-1.7.0;ActionBarSherlock@4.2.0;ColorPickerPreference@a6ffb91b1
+    prebuild=rm -f libs/xchange* && \
+        sed -i 's@\(reference.2=\).*@\1$$ColorPickerPreference$$@' project.properties && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+    build=sed -i '253,280d' $$XChange$$/pom.xml && \
+        $$MVN3$$ clean package -f $$XChange$$/pom.xml && \
+        mv $(find $$XChange$$ -name \*.jar) libs/
+
+Build:1.7.1,41
+    commit=v1.7.1
+    disable=Build fails
+
+Build:1.8.0,43
+    commit=v1.8.0
+    srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
+
+Build:1.8.2,46
+    commit=v1.8.2
+    srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
+
+Build:1.8.3,48
+    commit=v1.8.3
+    srclibs=ActionBarSherlock@4.4.0;ColorPickerPreference@15b666c2d64ae
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$ColorPickerPreference$$" >> project.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.8.0
-Current Version Code:43
+Current Version:1.8.3
+Current Version Code:48
 
diff --git a/metadata/com.vlille.checker.txt b/metadata/com.vlille.checker.txt
index 6358d4e098..84ab768af2 100644
--- a/metadata/com.vlille.checker.txt
+++ b/metadata/com.vlille.checker.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://github.com/ojacquemart/vlilleChecker
 Source Code:https://github.com/ojacquemart/vlilleChecker
@@ -7,41 +7,33 @@ Issue Tracker:https://github.com/ojacquemart/vlilleChecker/issues
 Auto Name:Vlille Checker
 Summary:Bicycle info for Lille
 Description:
-v2.2 utilise OpenStreetMap, mais Google Maps est nécessaire
-pour v1.1.
+Description below is in French, since the app is only of use to people living
+in France.
 
 Vlille Checker est dédié aux utilisateurs du V'Lille et de son service VLS
-(Vélos en Libre Service) à Lille.
-Au quotidien, l'application vous permet de gérer facilement vos stations
-favorites.
-Le but est de pouvoir "checker" facilement l'état des stations.
-Vlille Checker se veut efficace en proposant un contrôle en temps réel des
-stations.
-L'application offre également une recherche rapide et une localisation des
-stations les plus proches.
+(Vélos en Libre Service) à Lille.  Au quotidien, l'application vous permet de
+gérer facilement vos stations favorites.  Le but est de pouvoir "checker"
+facilement l'état des stations.  Vlille Checker se veut efficace en proposant
+un contrôle en temps réel des stations.  L'application offre également une
+recherche rapide et une localisation des stations les plus proches.
 .
 
 Repo Type:git
 Repo:https://github.com/ojacquemart/vlilleChecker.git
 
-#Not the release commit but better than nothing
-#Previous commits used a different ActionBar and didn't build
-Build Version:1.1,2,5be3e6d6e056,srclibs=ActionBarSherlock@6e3f2bb,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-#Build Version:2.2,5,!can't find apk at ce1a6bde9f,maven=yes,prebuild=rm -rf test src/test
-Build Version:2.2,5,ce1a6bde9f,srclibs=\
-ActionBarSherlock@4.1.0;PullToRefresh@v1.4.1.1,extlibs=\
-acra/acra-4.4.0.jar;commons-collections/commons-collections-3.2.1.jar;commons-lang/commons-lang3-3.1.jar;\
-osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar;junit/junit-4.8.1.jar,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-sed -i 's@\(android.library.reference.3=\).*@\1$$PullToRefresh$$/../extras/PullToRefreshListFragment@' project.properties && \
-$$SDK$$/tools/android update project -p $$PullToRefresh$$/../extras/PullToRefreshListFragment -s && \
-cp $$PullToRefresh$$/../extras/PullToRefreshListFragment/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+Build:3.0.0,600
+    commit=v3.0.0
+    subdir=app
+    gradle=yes
+    prebuild=sed -i 's/-SNAPSHOT//g;21s/actionbarsherlock/extra-abs/g' build.gradle
+
+Build:3.0.1,601
+    commit=v3.0.1
+    subdir=app
+    gradle=yes
 
 Auto Update Mode:None
-#Can't find version code on playmarket; Tags are behind
-Update Check Mode:RepoManifest
-Current Version:2.2
-Current Version Code:5
+Update Check Mode:Tags
+Current Version:3.0.1
+Current Version Code:601
 
diff --git a/metadata/com.vmihalachi.turboeditor.txt b/metadata/com.vmihalachi.turboeditor.txt
new file mode 100644
index 0000000000..26ea5a0f02
--- /dev/null
+++ b/metadata/com.vmihalachi.turboeditor.txt
@@ -0,0 +1,25 @@
+Categories:Office
+License:GPLv3
+Source Code:https://github.com/vmihalachi/turbo-editor
+Issue Tracker:https://github.com/vmihalachi/turbo-editor/issues
+Donate:https://github.com/vmihalachi/turbo-editor
+FlattrID:2173527
+
+Auto Name:Turbo Editor
+Summary:Simple text editor
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/vmihalachi/turbo-editor
+
+Build:1.3,7
+    commit=3697dd
+    subdir=Turbo Editor
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:7
+
diff --git a/metadata/com.voidcode.diasporawebclient.txt b/metadata/com.voidcode.diasporawebclient.txt
index fcb487f506..2e17e51954 100644
--- a/metadata/com.voidcode.diasporawebclient.txt
+++ b/metadata/com.voidcode.diasporawebclient.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/voidcode/Diaspora-Webclient
 Source Code:https://github.com/voidcode/Diaspora-Webclient
@@ -18,26 +18,13 @@ Build Version:1.5,6,a153d5f996f284da44d5defa25ce601fd76b53ad,target=android-10,p
 mkdir libs && \
 mv google-api-translate-java-0.97.jar libs/ && \
 mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
-#
-#Neither of the following two versions are buildable, the source appears to be
-#either incomplete or just plain wrong.
-#Build Version:1.6.1,8,622cac328da,target=android-10,prebuild=\
-#mkdir libs && \
-#mv google-api-translate-java-0.97.jar libs/ && \
-#mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
-#
-#Build Version:1.6.2,9,e124d00aff6d39,target=android-10,prebuild=\
-#mkdir libs && \
-#mv google-api-translate-java-0.97.jar libs/ && \
-#mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
 Build Version:1.6.3,10,8673ac9367dce08fecfde0f4858a03df4647864a,target=android-10,prebuild=\
 mkdir libs && \
 mv google-api-translate-java-0.97.jar libs/ && \
 mv microsoft-translator-java-api-0.4-jar-with-dependencies.jar libs/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.6.3
 Current Version Code:10
 
diff --git a/metadata/com.volosyukivan.txt b/metadata/com.volosyukivan.txt
index f7e5b9f613..7707bf85e0 100644
--- a/metadata/com.volosyukivan.txt
+++ b/metadata/com.volosyukivan.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:http://code.google.com/p/wifikeyboard/
-Source Code:http://code.google.com/p/wifikeyboard/source/checkout
-Issue Tracker:http://code.google.com/p/wifikeyboard/issues/list
+Source Code:http://code.google.com/p/wifikeyboard/source
+Issue Tracker:http://code.google.com/p/wifikeyboard/issues
 
 Auto Name:WiFiKeyboard
 Summary:Remote WiFi keyboard
diff --git a/metadata/com.vonglasow.michael.satstat.txt b/metadata/com.vonglasow.michael.satstat.txt
index 9014462bc3..c8549c4558 100644
--- a/metadata/com.vonglasow.michael.satstat.txt
+++ b/metadata/com.vonglasow.michael.satstat.txt
@@ -1,5 +1,5 @@
 ## See http://f-droid.org/manual for details
-Category:Navigation
+Categories:Navigation
 License:GPLv3+
 Web Site:https://github.com/mvglasow/satstat/wiki
 Source Code:https://github.com/mvglasow/satstat
@@ -11,8 +11,11 @@ Description:
 A diagnostic tool that displays data reported by sensors in the phone.
 
 GPS:
+* Refresh AGPS data (if supported by phone)
+* Status notification whenever an app accesses GPS (configurable)
 * Location, speed, bearing and error
 * Satellites in view and satellites used
+* Signal-to-noise ration (SNR) for each satellite
 * Time to first fix and time of last fix
 
 Sensors (as supported by your phone):
@@ -27,9 +30,8 @@ Sensors (as supported by your phone):
 * Proximity
 
 Networks:
-* GSM/CDMA cells in range
-* WiFi networks in range
-* Signal strength
+* GSM/CDMA cells in range with signal strength
+* WiFi networks in range, with channel and signal strength
 
 Known limitations:
 * Some phones will report only the network cell with which they are currently registered. On such phones you will only see one cell under "GSM" or "CDMA".  This is a limitation of the phone's radio firmware, and SatStat has no way of getting more information from the device.
@@ -38,12 +40,25 @@ Known limitations:
 Repo Type:git
 Repo:https://github.com/mvglasow/satstat.git
 
-Build Version:1.0,1,satstat-1.0
-Build Version:1.1,10,satstat-1.1
-Build Version:1.3,30,satstat-1.3
+Build:1.0,1
+    commit=satstat-1.0
 
-Auto Update Mode:None
+Build:1.1,10
+    commit=satstat-1.1
+
+Build:1.3,30
+    commit=satstat-1.3
+
+Build:1.4,40
+    commit=satstat-1.4
+    init=./setbuild.sh
+
+Build:1.5,50
+    commit=satstat-1.5
+    init=./setbuild.sh
+
+Auto Update Mode:Version satstat-%v
 Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:30
+Current Version:1.5
+Current Version Code:50
 
diff --git a/metadata/com.vwp.owmap.txt b/metadata/com.vwp.owmap.txt
new file mode 100644
index 0000000000..5c26c90a4d
--- /dev/null
+++ b/metadata/com.vwp.owmap.txt
@@ -0,0 +1,40 @@
+Categories:Navigation
+License:GPLv2
+Web Site:
+Source Code:https://sourceforge.net/p/libwlocate/code/ci/master/tree/master/android/OWMapAtAndroid
+Issue Tracker:https://sourceforge.net/p/libwlocate
+
+Name:OpenWLANMap
+Auto Name:OpenWLANMap@Android
+Summary:Help create a WiFi coverage map
+Description:
+For use in location services when no GPS is available (similar like Google 
+does but free and open and with an option to unsubscribe). 
+OpenWLANMap@Android is an App that helps to collect WLANs and their positions 
+and where user take part at a tracking contest.
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/libwlocate/code
+
+Build:0.95,95
+    commit=ebc753
+    subdir=master/android/OWMapAtAndroid
+    prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
+
+Build:1.01,101
+    commit=0675a1
+    subdir=master/android/OWMapAtAndroid
+    prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
+
+Build:1.02,102
+    commit=c0ea12
+    target=android-19
+    subdir=master/android/OWMapAtAndroid
+    prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.02
+Current Version Code:102
+
diff --git a/metadata/com.wanghaus.remembeer.txt b/metadata/com.wanghaus.remembeer.txt
index b7043832ae..9d83257f2f 100644
--- a/metadata/com.wanghaus.remembeer.txt
+++ b/metadata/com.wanghaus.remembeer.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Office
+Categories:Office
 License:Expat
 Web Site:http://remembeer.info
 Source Code:https://code.discordians.net/projects/remembeer/repository
@@ -16,6 +16,8 @@ Anti-feature: Network Services. The
 Beer Cloud - online database to which the app connects for info -
 is neither free-as-in-freedom nor open-source, but that behaviour can
 be disabled in the settings
+
+Status: Source repo vanished
 .
 
 Repo Type:git
@@ -25,7 +27,6 @@ Build Version:1.2.2,48,c9d64e35964e9c445749aa02e470354b5788d8b4,target=android-4
 Build Version:1.3.0,50,319231627d207cf7fb1d2ac23ada0ffdd486230c,target=android-4,subdir=android,prebuild=mv lib libs
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.3.0
 Current Version Code:50
diff --git a/metadata/com.weicheng.taipeiyoubikeoffline.txt b/metadata/com.weicheng.taipeiyoubikeoffline.txt
new file mode 100644
index 0000000000..03f5d228d0
--- /dev/null
+++ b/metadata/com.weicheng.taipeiyoubikeoffline.txt
@@ -0,0 +1,25 @@
+Categories:Navigation
+License:GPLv3
+Web Site:http://www.youbike.com.tw/home.php?eng=1
+Source Code:https://bitbucket.org/tiduswc2/taipei-youbike-offline/src
+Issue Tracker:https://bitbucket.org/tiduswc2/taipei-youbike-offline/issues
+Donate:http://techwagon.blogspot.com
+
+Auto Name:Taipei Youbike Offline
+Summary:Find bike stations in Taiwan
+Description:
+Browse the bike stations in Taiwan's capital city on a Mapnik (OSM) map
+(which are bundled). The interface of the app is only in Chinese currently.
+.
+
+Repo Type:hg
+Repo:https://bitbucket.org/tiduswc2/taipei-youbike-offline
+
+Build:1.0,1
+    commit=9148fb9
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/com.wentam.defcol.txt b/metadata/com.wentam.defcol.txt
new file mode 100644
index 0000000000..a063f1a93b
--- /dev/null
+++ b/metadata/com.wentam.defcol.txt
@@ -0,0 +1,26 @@
+Categories:Office
+License:Apache2
+Web Site:http://wentam.com
+Source Code:https://github.com/wentam/DefCol
+Issue Tracker:https://github.com/wentam/DefCol/issues
+
+Auto Name:DefCol
+Summary:Palette and color manager
+Description:
+Allows you to create palettes (color swatches/schemes) with the radial 
+palette, and edit them with a color picker. The color picker will also scale 
+to the size of your screen.
+You can also connect DefCol to your computer to make those palettes useful.
+.
+
+Repo Type:git
+Repo:https://github.com/wentam/DefCol.git
+
+Build:0.9.10,6
+    commit=f1e38
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.9.10
+Current Version Code:6
+
diff --git a/metadata/com.willhauck.linconnectclient.txt b/metadata/com.willhauck.linconnectclient.txt
new file mode 100644
index 0000000000..509626109a
--- /dev/null
+++ b/metadata/com.willhauck.linconnectclient.txt
@@ -0,0 +1,34 @@
+Categories:System
+License:GPLv3
+Web Site:
+Source Code:https://github.com/hauckwill/linconnect-client
+Issue Tracker:https://github.com/hauckwill/linconnect-client/issues
+
+Auto Name:LinConnect
+Summary:Mirror notifications to desktop
+Description:
+Install the server on the desktop: see the source code page.
+
+* Extremely simple setup
+* Integrated with Linux desktop icon theme
+* Uses LibNotify and Python for compatibility
+ 
+Encryption isn't yet supported.
+
+Status: Alpha
+.
+
+Repo Type:git
+Repo:https://github.com/hauckwill/linconnect-client.git
+
+Build:2.13,7
+    commit=0d2e7bd73564b6
+    subdir=LinConnectClient
+    target=android-19
+    srclibs=1:Changelog-cketti@v1.2.0
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.13
+Current Version Code:7
+
diff --git a/metadata/com.write.Quill.txt b/metadata/com.write.Quill.txt
index 5ccc9dfa57..6b93bcbbce 100644
--- a/metadata/com.write.Quill.txt
+++ b/metadata/com.write.Quill.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/android-quill/
-Source Code:http://code.google.com/p/android-quill/source/checkout
-Issue Tracker:http://code.google.com/p/android-quill/issues/list
+Source Code:http://code.google.com/p/android-quill/source
+Issue Tracker:http://code.google.com/p/android-quill/issues
 
 Auto Name:Quill
 Summary:Pen note-taking
@@ -26,7 +26,7 @@ Description:
 The n-trig active pen has been tested on the ThinkPad Tablet, HTC Jetstream, and the HTC Flyer (Honeycomb).
 The Samsung S-pen has been tested on the Galaxy Note (ICS). The basic functionality should work on any
 Android tablet, but distinguishing pen from finger data and pressure sensitivity might not work on others.
-Please let me know your results if you try it on another tablet. See
+You can contact upstream with your results if you try it on another tablet. See
 the [http://code.google.com/p/android-quill/wiki/SupportedDevices wiki] for more details.
 .
 
diff --git a/metadata/com.xabber.androiddev.txt b/metadata/com.xabber.androiddev.txt
index f2f5f489b5..a1d2350d0b 100644
--- a/metadata/com.xabber.androiddev.txt
+++ b/metadata/com.xabber.androiddev.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://www.xabber.com/
 Source Code:https://github.com/redsolution/xabber-android
diff --git a/metadata/com.xatik.app.droiddraw.client.txt b/metadata/com.xatik.app.droiddraw.client.txt
index e19b5813bc..3df6375da7 100644
--- a/metadata/com.xatik.app.droiddraw.client.txt
+++ b/metadata/com.xatik.app.droiddraw.client.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://www.xatik.com/app/droid-draw/
 Source Code:https://bitbucket.org/XatikGroup/droiddraw/src
diff --git a/metadata/com.xlythe.minecraftclock.txt b/metadata/com.xlythe.minecraftclock.txt
index 610ce0bbe7..f15a082340 100644
--- a/metadata/com.xlythe.minecraftclock.txt
+++ b/metadata/com.xlythe.minecraftclock.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/Xlythe/MinecraftClock
diff --git a/metadata/com.yubico.yubiclip.txt b/metadata/com.yubico.yubiclip.txt
new file mode 100644
index 0000000000..9d3bb63a45
--- /dev/null
+++ b/metadata/com.yubico.yubiclip.txt
@@ -0,0 +1,23 @@
+Categories:System
+License:NewBSD
+Web Site:https://github.com/Yubico/yubiclip-android
+Source Code:https://github.com/Yubico/yubiclip-android
+Issue Tracker:https://github.com/Yubico/yubiclip-android/issues
+
+Auto Name:YubiClip
+Summary:Copy YubiKey NEO OTP from NFC to clipboard
+Description:
+Read a One-Time Password (OTP) from a YubiKey NEO over NFC, and
+copy it to the system clipboard.
+.
+
+Repo Type:git
+Repo:git://github.com/Yubico/yubiclip-android.git
+
+Build Version:0.0.1,1,yubiclip-0.0.1,maven=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.0.1
+Current Version Code:1
+
diff --git a/metadata/com.yubico.yubioath.txt b/metadata/com.yubico.yubioath.txt
index e7be2e3ea5..35b861eefb 100644
--- a/metadata/com.yubico.yubioath.txt
+++ b/metadata/com.yubico.yubioath.txt
@@ -1,30 +1,53 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:https://github.com/Yubico/yubioath-android
 Source Code:https://github.com/Yubico/yubioath-android
 Issue Tracker:https://github.com/Yubico/yubioath-android/issues
 
 Auto Name:YubiOATH
-Summary:YubiKey NEO over NFC authorization
+Summary:Generate OATH codes with YubiKey NEO over NFC
 Description:
 Generate One-Time Passwords (OTPs) using a YubiKey NEO hardware,
 connected using NFC. It generates codes that are compatible with
 Google two-step verification, and can be used with any other site
-that supports OATH OATH.  This app requires that the YubiKey NEO
-has the OATH applet installed.  This app provides more features
-than the YubiTOTP app which does not require any OATH applet on
-the YubiKey NEO.
+that supports OATH HOTP/TOTP.
+
+There are two apps for YubiKey NEO and OATH: YubiTOTP and YubiOATH.
+They work differently, and both are supported, but to get the most
+features and best user experience we recommend use of YubiOATH.  The
+YubiTOTP app works with all YubiKey NEOs, however it is more limited
+than the YubiOATH app.  The YubiOATH app requires that the (free
+software) ykneo-oath applet has been loaded on to the YubiKey NEO.
+The YubiTOTP app is still maintained for backwards compatibility.
 .
 
 Repo Type:git
 Repo:git://github.com/Yubico/yubioath-android.git
 
-Build Version:0.0.4,10,yubioath-0.0.4,maven=yes,bindir=target
-Build Version:0.1.3,14,yubioath-0.1.3,maven=yes,bindir=target
-Build Version:0.1.4,15,!build failing - can't find output (at yubioath-0.1.4),maven=yes
+Build:0.0.4,10
+    commit=yubioath-0.0.4
+    maven=yes
+    bindir=target
+
+Build:0.1.3,14
+    commit=yubioath-0.1.3
+    maven=yes
+    bindir=target
+
+Build:0.1.4,15
+    commit=yubioath-0.1.4
+    maven=yes
+
+Build:0.1.6,17
+    commit=yubioath-0.1.6
+    maven=yes
+
+Build:0.1.7,18
+    commit=yubioath-0.1.7
+    maven=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.1.4
-Current Version Code:15
+Current Version:0.1.7
+Current Version Code:18
 
diff --git a/metadata/com.yubico.yubitotp.txt b/metadata/com.yubico.yubitotp.txt
index 3bdeeed1d0..a8f6ed7597 100644
--- a/metadata/com.yubico.yubitotp.txt
+++ b/metadata/com.yubico.yubitotp.txt
@@ -1,16 +1,24 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:https://github.com/Yubico/yubitotp-android
 Source Code:https://github.com/Yubico/yubitotp-android
 Issue Tracker:https://github.com/Yubico/yubitotp-android/issues
 
 Auto Name:YubiTOTP
-Summary:One-Time Passwords from key fobs
+Summary:Generate OATH codes with YubiKey NEO over NFC
 Description:
 Generate One-Time Passwords (OTPs) using a YubiKey NEO hardware,
 connected using NFC. It generates codes that are compatible with
 Google two-step verification, and can be used with any other site
 that supports OATH TOTP.
+
+There are two apps for YubiKey NEO and OATH: YubiTOTP and YubiOATH.
+They work differently, and both are supported, but to get the most
+features and best user experience we recommend use of YubiOATH.  The
+YubiTOTP app works with all YubiKey NEOs, however it is more limited
+than the YubiOATH app.  The YubiOATH app requires that the (free
+software) ykneo-oath applet has been loaded on to the YubiKey NEO.
+The YubiTOTP app is still maintained for backwards compatibility.
 .
 
 Repo Type:git
diff --git a/metadata/com.zachrattner.pockettalk.txt b/metadata/com.zachrattner.pockettalk.txt
index 1add3a3776..a08a81ccbb 100644
--- a/metadata/com.zachrattner.pockettalk.txt
+++ b/metadata/com.zachrattner.pockettalk.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://www.zachrattner.com/
 Source Code:http://pockettalk.zachrattner.com/svn
diff --git a/metadata/com.zagayevskiy.pacman.txt b/metadata/com.zagayevskiy.pacman.txt
new file mode 100644
index 0000000000..d0f1d09128
--- /dev/null
+++ b/metadata/com.zagayevskiy.pacman.txt
@@ -0,0 +1,27 @@
+Categories:Games
+License:MIT
+Web Site:https://github.com/zagayevskiy/Pacman
+Source Code:https://github.com/zagayevskiy/Pacman
+Issue Tracker:https://github.com/zagayevskiy/Pacman/issues
+
+Summary:Old legend in new form
+Description:
+A a Pac*-like game. Meet the old legend in the new form! Light your own fire,
+get into maze and don’t let to extinguish you. Try the Jaws of Fire!
+.
+
+Repo Type:git
+Repo:https://github.com/zagayevskiy/Pacman.git
+
+Build:1.1,2
+    commit=6ecb7ee353a
+    target=android-15
+    prebuild=sed -i '8s/__/\/\//g' jni/log.h
+    build=$$NDK$$/ndk-build -i -k -I "$$NDK$$/platforms/android-9/arch-arm/usr/lib" -I "$$NDK$$/platforms/android-9/arch-arm/usr/include" 
+    buildjni=no
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/com.zapta.apps.maniana.txt b/metadata/com.zapta.apps.maniana.txt
index d998b96c76..1a03faeaf8 100644
--- a/metadata/com.zapta.apps.maniana.txt
+++ b/metadata/com.zapta.apps.maniana.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/maniana/
-Source Code:http://code.google.com/p/maniana/source/checkout
-Issue Tracker:http://code.google.com/p/maniana/issues/list
+Source Code:http://code.google.com/p/maniana/source
+Issue Tracker:http://code.google.com/p/maniana/issues
 
 Auto Name:Maniana
 Summary:User-friendly todo list app
@@ -29,8 +29,7 @@ Build Version:1.2.25,25,926280e79670,subdir=Maniana
 Build Version:1.26,26015,f973b380b37cd11a3701b,subdir=Maniana
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.26
 Current Version Code:26015
 
diff --git a/metadata/com.zaren.txt b/metadata/com.zaren.txt
index 92f950cc40..193443f9a5 100644
--- a/metadata/com.zaren.txt
+++ b/metadata/com.zaren.txt
@@ -1,4 +1,5 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/zaren678/Hdhomerun-signal-meter
 Source Code:https://github.com/zaren678/Hdhomerun-signal-meter
diff --git a/metadata/com.zegoggles.gist.txt b/metadata/com.zegoggles.gist.txt
index 617bd679f3..7c6179414c 100644
--- a/metadata/com.zegoggles.gist.txt
+++ b/metadata/com.zegoggles.gist.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:MIT
 Web Site:https://github.com/jberkel/gist-it#readme
 Source Code:https://github.com/jberkel/gist-it
diff --git a/metadata/com.zegoggles.smssync.txt b/metadata/com.zegoggles.smssync.txt
index 56370bbe08..d56550601d 100644
--- a/metadata/com.zegoggles.smssync.txt
+++ b/metadata/com.zegoggles.smssync.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:Apache2
 Web Site:https://github.com/jberkel/sms-backup-plus
 Source Code:https://github.com/jberkel/sms-backup-plus
diff --git a/metadata/com.zoffcc.applications.aagtl.txt b/metadata/com.zoffcc.applications.aagtl.txt
index 116404b3fb..3f7e06549a 100644
--- a/metadata/com.zoffcc.applications.aagtl.txt
+++ b/metadata/com.zoffcc.applications.aagtl.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv2
 Web Site:http://aagtl.work.zoff.cc/
 Source Code:http://aagtl.zoffcc.com/aagtl_public1/
diff --git a/metadata/cri.sanity.txt b/metadata/cri.sanity.txt
index 18690e004c..e53ac9a5e3 100644
--- a/metadata/cri.sanity.txt
+++ b/metadata/cri.sanity.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3+
 Web Site:https://github.com/awaken/sanity
 Source Code:https://github.com/awaken/sanity
diff --git a/metadata/csh.cryptonite.txt b/metadata/csh.cryptonite.txt
index 5ca945c30b..d6977e1cfb 100644
--- a/metadata/csh.cryptonite.txt
+++ b/metadata/csh.cryptonite.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://code.google.com/p/cryptonite/
-Source Code:https://code.google.com/p/cryptonite/source/browse/#git%2Fcryptonite
-Issue Tracker:https://code.google.com/p/cryptonite/issues/list
+Source Code:https://code.google.com/p/cryptonite/source
+Issue Tracker:https://code.google.com/p/cryptonite/issues
 
 Auto Name:Cryptonite
 Summary:Encfs and Truecrypt for Android
diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt
index 753b353160..54a1883c33 100644
--- a/metadata/cx.hell.android.pdfview.txt
+++ b/metadata/cx.hell.android.pdfview.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://code.google.com/p/apv/
-Source Code:http://code.google.com/p/apv/source/checkout
-Issue Tracker:http://code.google.com/p/apv/issues/list
+Source Code:http://code.google.com/p/apv/source
+Issue Tracker:http://code.google.com/p/apv/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKB59NTKW9QLS
 Bitcoin:1MLdh6uAPymWVJ4bmRde684uTcLJWwumkK
 
diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt
index 4243967aa7..2399a5b221 100644
--- a/metadata/cx.hell.android.pdfviewpro.txt
+++ b/metadata/cx.hell.android.pdfviewpro.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://code.google.com/p/apv/
-Source Code:http://code.google.com/p/apv/source/list
-Issue Tracker:http://code.google.com/p/apv/issues/list
+Source Code:http://code.google.com/p/apv/source
+Issue Tracker:http://code.google.com/p/apv/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKB59NTKW9QLS
 Bitcoin:1MLdh6uAPymWVJ4bmRde684uTcLJWwumkK
 
diff --git a/metadata/cxa.lineswallpaper.txt b/metadata/cxa.lineswallpaper.txt
index 7c02aecff7..440de457a7 100644
--- a/metadata/cxa.lineswallpaper.txt
+++ b/metadata/cxa.lineswallpaper.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:MIT
 Web Site:http://alexanderfedora.blogspot.com
 Source Code:https://github.com/ghisguth/blurred-lines-live
@@ -18,8 +18,7 @@ Repo:https://github.com/ghisguth/blurred-lines-live.git
 Build Version:1.1-2,9,4310949
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1-2
 Current Version Code:9
 
diff --git a/metadata/cz.hejl.chesswalk.txt b/metadata/cz.hejl.chesswalk.txt
index e98901fae3..4b1df6b515 100644
--- a/metadata/cz.hejl.chesswalk.txt
+++ b/metadata/cz.hejl.chesswalk.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://gitorious.org/chesswalk
 Source Code:https://gitorious.org/chesswalk
@@ -8,16 +8,28 @@ Auto Name:Chess Walk
 Summary:Chess game and FICS client
 Description:
 Play chess offline, or play online at FICS.
+
+Many new languages translated in 1.5.2. If you want to help with your
+language, please visit [http://f-droid.org/wiki].
 .
 
 Repo Type:git
 Repo:https://git.gitorious.org/chesswalk/chesswalk.git
 
-Build Version:1.5,7,4007173d,buildjni=yes
-Build Version:1.5.1,8,85bf592e,buildjni=yes
+Build:1.5,7
+    commit=4007173d
+    buildjni=yes
+
+Build:1.5.1,8
+    commit=85bf592e
+    buildjni=yes
+
+Build:1.5.2,9
+    commit=1.5.2
+    buildjni=yes
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5.1
-Current Version Code:8
+Update Check Mode:Tags
+Current Version:1.5.2
+Current Version Code:9
 
diff --git a/metadata/cz.romario.opensudoku.txt b/metadata/cz.romario.opensudoku.txt
index 1485a812c9..14dcef2810 100644
--- a/metadata/cz.romario.opensudoku.txt
+++ b/metadata/cz.romario.opensudoku.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/opensudoku-android/
 Source Code:https://github.com/romario333/opensudoku
@@ -7,9 +7,10 @@ Issue Tracker:https://github.com/romario333/opensudoku/issues
 Auto Name:OpenSudoku
 Summary:Sudoku game
 Description:
-OpenSudoku is a simple open source sudoku game. It's designed to be controlled both
-by finger and keyboard. It's preloaded with 90 puzzles in 3 difficulty levels. More
-puzzles can be downloaded from the web and it also allows you to enter your own.
+OpenSudoku is a simple sudoku game. It's designed to be controlled both
+by finger and keyboard. It's preloaded with 90 puzzles in 3 difficulty levels.
+More puzzles can be downloaded from the web and it also allows you to enter
+your own.
 .
 
 #Repo:http://opensudoku-android.googlecode.com/svn/trunk/OpenSudoku
diff --git a/metadata/damo.three.ie.txt b/metadata/damo.three.ie.txt
index e0c4a20932..02eda8e2f7 100644
--- a/metadata/damo.three.ie.txt
+++ b/metadata/damo.three.ie.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:
 Source Code:https://github.com/DamienOReilly/PrepayCredit
diff --git a/metadata/dasher.android.txt b/metadata/dasher.android.txt
index 3cac600b17..c93518eed3 100644
--- a/metadata/dasher.android.txt
+++ b/metadata/dasher.android.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.inference.phy.cam.ac.uk/dasher/MobileDasher.html
 Source Code:https://github.com/acl33/AndroidDasher
diff --git a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
index 6e1316d106..e39ca20956 100644
--- a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
+++ b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://sourceforge.net/p/yubnubapp/
 Source Code:http://sourceforge.net/p/yubnubapp/code
diff --git a/metadata/de.antonwolf.agendawidget.txt b/metadata/de.antonwolf.agendawidget.txt
index abefd3c27e..8018fd1c2e 100644
--- a/metadata/de.antonwolf.agendawidget.txt
+++ b/metadata/de.antonwolf.agendawidget.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:http://code.google.com/p/antons-apps/
-Source Code:http://code.google.com/p/antons-apps/source/checkout
-Issue Tracker:http://code.google.com/p/antons-apps/issues/list
+Source Code:http://code.google.com/p/antons-apps/source
+Issue Tracker:http://code.google.com/p/antons-apps/issues
 
 Name:Anton Widget
 Auto Name:Anton's Calendar Widget
diff --git a/metadata/de.arnowelzel.android.periodical.txt b/metadata/de.arnowelzel.android.periodical.txt
index 2dcd511260..4bf0869ca5 100644
--- a/metadata/de.arnowelzel.android.periodical.txt
+++ b/metadata/de.arnowelzel.android.periodical.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3+
 Web Site:http://arnowelzel.de/wiki/en/android/app/periodical
 Source Code:http://arnowelzel.de/svn/Periodical
diff --git a/metadata/de.azapps.mirakel.dashclock.txt b/metadata/de.azapps.mirakel.dashclock.txt
new file mode 100644
index 0000000000..4e3b6955d6
--- /dev/null
+++ b/metadata/de.azapps.mirakel.dashclock.txt
@@ -0,0 +1,37 @@
+Categories:Office
+License:GPLv3+
+Web Site:http://mirakel.azapps.de
+Source Code:https://github.com/azapps/mirakel-dashclock
+Issue Tracker:https://github.com/azapps/mirakel-dashclock/issues
+Donate:http://mirakel.azapps.de/help_us.html#donate
+FlattrID:2188714
+
+Auto Name:Mirakel-Dashclock
+Summary:Dashclock extension for Mirakel
+Description:
+Extension for [[net.nurik.roman.dashclock]] that integrates with
+[[de.azapps.mirakelandroid]].
+.
+
+Repo Type:git
+Repo:https://github.com/azapps/mirakel-dashclock.git
+
+Build:1.1,4
+    commit=v1.1
+
+Build:1.2,5
+    commit=v1.2
+
+Build:1.3,7
+    commit=42e2cd3f4
+
+Maintainer Notes:
+Was auto-update and Tags in the past, but v1.3 was (and still is) wrongly tagged,
+and 1.2.1 wasn't tagged at all.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:7
+
diff --git a/metadata/de.azapps.mirakelandroid.txt b/metadata/de.azapps.mirakelandroid.txt
index 4955dd3218..6c742cdb40 100644
--- a/metadata/de.azapps.mirakelandroid.txt
+++ b/metadata/de.azapps.mirakelandroid.txt
@@ -1,37 +1,75 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://mirakel.azapps.de
 Source Code:https://github.com/azapps/mirakel-android
 Issue Tracker:https://github.com/azapps/mirakel-android/issues
+Donate:http://mirakel.azapps.de/help_us.html#donate
+FlattrID:2188714
 
 Name:Mirakel
-Auto Name:MirakleApp
+Auto Name:Mirakel
 Summary:Decentralized TODO list
 Description:
 Mirakel is a simple but powerful tool for managing your TODO-lists.
 You can sync your lists with your own server! Features:
 
 *  Manage your tasks in lists
-*  Simple, but powerful UI with Tablet support
+*  Simple, but powerful User Interface
+*  Tablet-UI
 *  Nice little widget
 *  Sort your tasks in different ways
+*  Fully configurable
 *  Notifications & Reminders
 *  Easy Backup and Import
 *  Import your tasks from Astrid
-*  Sync the lists with your own (or the developers') server (→Experimental!)
+*  Sync with Taskwarrior
+*  Sync with CalDAV
+
+[http://mirakel.azapps.de/changelog.html Changelog] 
 .
 
 Repo Type:git
 Repo:https://github.com/azapps/mirakel-android.git
 
-Build Version:1.0.0,2,v1.0
-Build Version:1.0.1,3,v1.0.1.1
-Build Version:1.1.0,4,v1.1.0
-Build Version:1.1.1,5,v1.1.1
-Build Version:2.0,6,v2.0
+Build:1.0.0,2
+    commit=v1.0
 
-Auto Update Mode:Version %v
+Build:1.0.1,3
+    commit=v1.0.1.1
+
+Build:1.1.0,4
+    commit=v1.1.0
+
+Build:1.1.1,5
+    commit=v1.1.1
+
+Build:2.0,6
+    commit=v2.0
+
+Build:2.1,7
+    commit=v2.1
+
+Build:2.1.1,8
+    commit=v2.1.1
+
+Build:2.1.2,10
+    commit=v2.1.2
+
+Build:2.1.3,16
+    commit=v2.1.3
+
+Build:2.1.4,17
+    commit=v2.1.4
+
+Build:2.2.0,29
+    disable=old failing build
+    commit=v2.2.0
+
+Build:2.2.1,31
+    commit=v2.2.1
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.0
-Current Version Code:6
+Current Version:2.2.1
+Current Version Code:31
 
diff --git a/metadata/de.bashtian.dashclocksunrise.txt b/metadata/de.bashtian.dashclocksunrise.txt
index e7e808f3ae..7171115e68 100644
--- a/metadata/de.bashtian.dashclocksunrise.txt
+++ b/metadata/de.bashtian.dashclocksunrise.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/bashtian/dashclock-sunrise
 Source Code:https://github.com/bashtian/dashclock-sunrise
diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt
index 33e76844c3..f74f1da7de 100644
--- a/metadata/de.blau.android.txt
+++ b/metadata/de.blau.android.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:https://code.google.com/p/osmeditor4android
-Source Code:https://code.google.com/p/osmeditor4android/source/list
-Issue Tracker:https://code.google.com/p/osmeditor4android/issues/list
+Source Code:https://code.google.com/p/osmeditor4android/source
+Issue Tracker:https://code.google.com/p/osmeditor4android/issues
 
 Auto Name:Vespucci
 Summary:OpenStreetMap editor
@@ -26,24 +26,37 @@ Instructions are on the [https://code.google.com/p/osmeditor4android/wiki/Overvi
 .
 
 Repo Type:git-svn
-Repo:http://osmeditor4android.googlecode.com/svn/trunk
+Repo:http://osmeditor4android.googlecode.com/svn;trunk=trunk;branches=branches
 
-Build Version:0.7.0,14,201
-Build Version:0.8.1r402,17,404,\
-srclibs=ActionBarSherlock@4.1.0,target=android-14,extlibs=android/android-support-v4.jar,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.8.2r416,18,416,\
-srclibs=ActionBarSherlock@4.1.0,target=android-14,extlibs=android/android-support-v4.jar,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.8.3r419,19,419,srclibs=ActionBarSherlock@4.2.0,target=android-14,\
-extlibs=android/android-support-v4.jar,prebuild=sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' \
-project.properties && cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+Build:0.7.0,14
+    commit=201
+
+Build:0.8.1r402,17
+    commit=404
+    target=android-14
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.8.2r416,18
+    commit=416
+    target=android-14
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.8.3r419,19
+    commit=419
+    target=android-14
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
 Auto Update Mode:None
-# Version in res/values/appname.xml; device variable i.e see playmarket for date
-Update Check Mode:RepoManifest
-Current Version:0.8.3r419
-Current Version Code:19
+Update Check Mode:RepoManifest/0.9
+Current Version:0.9.3r677
+Current Version Code:25
 
diff --git a/metadata/de.blinkt.openvpn.txt b/metadata/de.blinkt.openvpn.txt
index f70acf4ed6..016a47c889 100644
--- a/metadata/de.blinkt.openvpn.txt
+++ b/metadata/de.blinkt.openvpn.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:NewBSD/GPLv2
 Web Site:http://code.google.com/p/ics-openvpn/
-Source Code:http://code.google.com/p/ics-openvpn/source/checkout
-Issue Tracker:http://code.google.com/p/ics-openvpn/issues/list
+Source Code:http://code.google.com/p/ics-openvpn/source
+Issue Tracker:http://code.google.com/p/ics-openvpn/issues
 
 Auto Name:OpenVPN for Android
 Summary:OpenVPN without root
@@ -15,18 +15,87 @@ under the GPL.
 Repo Type:hg
 Repo:https://code.google.com/p/ics-openvpn/
 
-Build Version:0.5.21,48,!broken v0.5.21,buildjni=yes
-Build Version:0.5.22,49,!broken v0.5.22,buildjni=yes
-Build Version:0.5.24,51,!broken too v0.5.24,buildjni=no,target=android-14,prebuild=\
-sed -i 's/ndk-build APP_API=all -j 8/ndk-build APP_ABI=all -j 2/g' build-native.sh && ./build-native.sh
-Build Version:0.5.35,63,!broken too v0.5.35,buildjni=no,target=android-17,prebuild=\
-sed -i 's/-j 8/-j 2/g' build-native.sh && ./build-native.sh
-Build Version:0.5.47,80,!doesn't build at v0.5.47,buildjni=no,gradle=yes,build=\
-    echo WITH_BREAKPAD=0 >> jni/Android.mk && sed -i '/google-breakpad/d' jni/Android.mk && \
-    sed -i 's/-j 8/-j 2/g' misc/build-native.sh && ./misc/build-native.sh
+Build:0.5.21,48
+    disable=broken v0.5.21
+    commit=unknown - see disabled
+    buildjni=yes
 
-Auto Update Mode:None
+Build:0.5.22,49
+    disable=broken v0.5.22
+    commit=unknown - see disabled
+    buildjni=yes
+
+Build:0.5.24,51
+    disable=broken too v0.5.24
+    commit=unknown - see disabled
+    target=android-14
+    prebuild=sed -i 's/ndk-build APP_API=all -j 8/ndk-build APP_ABI=all -j 2/g' build-native.sh && \
+        ./build-native.sh
+    buildjni=no
+
+Build:0.5.35,63
+    disable=broken too v0.5.35
+    commit=unknown - see disabled
+    target=android-17
+    prebuild=sed -i 's/-j 8/-j 2/g' build-native.sh && \
+        ./build-native.sh
+    buildjni=no
+
+Build:0.5.47,80
+    commit=v0.5.47
+    gradle=yes
+    rm=assets
+    prebuild=sed -i '/google-breakpad/d' jni/Android.mk && \
+        sed -i -e '/+=.*breakpad/d' -e 's/ [^ ]*breakpad[^ ]*//' openvpn/Android.mk && \
+        find openvpn/src -type f -print0 | xargs -0 sed -i '/breakpad/d' && \
+        rm -f openvpn/src/openvpn/breakpad.*
+    build=echo WITH_BREAKPAD=0 >> jni/Android.mk && \
+        sed -i 's/-j 8/-j 4/g' misc/build-native.sh && \
+        ./misc/build-native.sh
+    buildjni=no
+
+Build:0.6.0,81
+    commit=v0.6.0
+    gradle=yes
+    prebuild=sed -i '/google-breakpad/d' jni/Android.mk && \
+        sed -i -e '/+=.*breakpad/d' -e 's/ [^ ]*breakpad[^ ]*//' openvpn/Android.mk && \
+        find openvpn/src -type f -print0 | xargs -0 sed -i '/breakpad/d' && \
+        rm -f openvpn/src/openvpn/breakpad.* && \
+        mv src/de/blinkt/openvpn/fragments/SeekbarTicks.java src/de/blinkt/openvpn/fragments/SeekBarTicks.java
+    scandelete=assets
+    build=echo WITH_BREAKPAD=0 >> jni/Android.mk && \
+        sed -i 's/-j 8/-j 4/g' misc/build-native.sh && \
+        ./misc/build-native.sh
+    buildjni=no
+
+Build:0.6.1,82
+    commit=v0.6.1
+    gradle=yes
+    prebuild=sed -i '/google-breakpad/d' jni/Android.mk && \
+        sed -i -e '/+=.*breakpad/d' -e 's/ [^ ]*breakpad[^ ]*//' openvpn/Android.mk && \
+        find openvpn/src -type f -print0 | xargs -0 sed -i '/breakpad/d' && \
+        rm -f openvpn/src/openvpn/breakpad.*
+    scandelete=assets
+    build=echo WITH_BREAKPAD=0 >> jni/Android.mk && \
+        sed -i 's/-j 8/-j 4/g' misc/build-native.sh && \
+        ./misc/build-native.sh
+    buildjni=no
+
+Build:0.6.4,85
+    commit=v0.6.4
+    gradle=yes
+    prebuild=sed -i '/google-breakpad/d' jni/Android.mk && \
+        sed -i -e '/+=.*breakpad/d' -e 's/ [^ ]*breakpad[^ ]*//' openvpn/Android.mk && \
+        find openvpn/src -type f -print0 | xargs -0 sed -i '/breakpad/d' && \
+        rm -f openvpn/src/openvpn/breakpad.*
+    scandelete=assets
+    build=echo WITH_BREAKPAD=0 >> jni/Android.mk && \
+        sed -i 's/-j 8/-j 4/g' misc/build-native.sh && \
+        ./misc/build-native.sh
+    buildjni=no
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.5.37
-Current Version Code:67
+Current Version:0.6.4
+Current Version Code:85
 
diff --git a/metadata/de.cketti.dashclock.k9.txt b/metadata/de.cketti.dashclock.k9.txt
index c6334daa84..8752cd087b 100644
--- a/metadata/de.cketti.dashclock.k9.txt
+++ b/metadata/de.cketti.dashclock.k9.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/cketti/DashClock_K-9
@@ -17,13 +17,24 @@ if you are using v4.201 of K-9 — current versions of K-9 should work fine.
 Repo Type:git
 Repo:https://github.com/cketti/DashClock_K-9.git
 
-Build Version:1.0,1,release-v1.0
-Build Version:1.1,2,release-v1.1
-Build Version:1.2,3,release-v1.2
-Build Version:1.3,4,release-v1.3
+Build:1.0,1
+    commit=release-v1.0
 
-Auto Update Mode:None
+Build:1.1,2
+    disable=old failing build
+    commit=release-v1.1
+
+Build:1.2,3
+    commit=release-v1.2
+
+Build:1.3,4
+    commit=release-v1.3
+
+Build:1.4,104000
+    commit=release-v1.4
+
+Auto Update Mode:Version release-v%v
 Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:4
+Current Version:1.4
+Current Version Code:104000
 
diff --git a/metadata/de.cwde.freeshisen.txt b/metadata/de.cwde.freeshisen.txt
new file mode 100644
index 0000000000..567f8822b7
--- /dev/null
+++ b/metadata/de.cwde.freeshisen.txt
@@ -0,0 +1,24 @@
+Categories:Games
+License:GPLv2
+Web Site:https://code.google.com/p/freeshisen
+Source Code:https://code.google.com/p/freeshisen/source
+Issue Tracker:https://code.google.com/p/freeshisen/issues
+
+Summary:Shisen-Sho game
+Description:
+Shisen-Sho is a Japanese tile-based game which uses Mahjong tiles. The
+objective is to match similar tiles in pairs until every tile has been
+removed.
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/freeshisen/
+
+Build:0.3,7
+    commit=b4f0ce3614b2
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.3
+Current Version Code:7
+
diff --git a/metadata/de.danielweisser.android.ldapsync.txt b/metadata/de.danielweisser.android.ldapsync.txt
index 82c8a0b4d4..7400f08c83 100644
--- a/metadata/de.danielweisser.android.ldapsync.txt
+++ b/metadata/de.danielweisser.android.ldapsync.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://www.danielweisser.de/blog
 Source Code:https://github.com/weisserd/LDAP-Sync
@@ -16,8 +16,7 @@ Repo:https://github.com/weisserd/LDAP-Sync.git
 Build Version:1.5,12,6198272a
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:12
 
diff --git a/metadata/de.danoeh.antennapod.txt b/metadata/de.danoeh.antennapod.txt
index 3047b542b6..a1623913ba 100644
--- a/metadata/de.danoeh.antennapod.txt
+++ b/metadata/de.danoeh.antennapod.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:
 Source Code:https://github.com/danieloeh/AntennaPod
diff --git a/metadata/de.delusions.measure.txt b/metadata/de.delusions.measure.txt
index e194b64eab..b4569307a9 100644
--- a/metadata/de.delusions.measure.txt
+++ b/metadata/de.delusions.measure.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://www.workreloaded.com/software/droid-weight/
-Source Code:http://code.google.com/p/droidweight/source/checkout
-Issue Tracker:http://code.google.com/p/droidweight/issues/list
+Source Code:http://code.google.com/p/droidweight/source
+Issue Tracker:http://code.google.com/p/droidweight/issues
 
 Auto Name:DroidWeight
 Summary:Weight tracker
@@ -23,8 +23,7 @@ Build Version:1.3.3,9,be139bc9d72a
 Build Version:1.5.4,17,version-17
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.5.4
 Current Version Code:17
 
diff --git a/metadata/de.duenndns.gmdice.txt b/metadata/de.duenndns.gmdice.txt
index cb9a480f61..404e1faf03 100644
--- a/metadata/de.duenndns.gmdice.txt
+++ b/metadata/de.duenndns.gmdice.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:https://github.com/ge0rg/gamemasterdice
 Source Code:https://github.com/ge0rg/gamemasterdice
@@ -10,17 +10,17 @@ Description:
 A dice rolling application with a special focus on the 3D20 role playing game (RPG) system.
 
 Features:
-*four configurable dice buttons (long-press to configure)
-*backlog of recent dice rolls
-*remembers the most commonly used dice
+* four configurable dice buttons (long-press to configure)
+* backlog of recent dice rolls
+* remembers the most commonly used dice
 
 Supported games:
-*Dungeons & Dragons (DnD)
-*Neuroshima
-*Monastyr
-*Star Wars RPG
-*Shadowrun
-*and further d20 and 3d20 titles
+* Dungeons & Dragons (DnD)
+* Neuroshima
+* Monastyr
+* Star Wars RPG
+* Shadowrun
+* and further d20 and 3d20 titles
 .
 
 Repo Type:git
diff --git a/metadata/de.enaikoon.android.keypadmapper3.txt b/metadata/de.enaikoon.android.keypadmapper3.txt
new file mode 100644
index 0000000000..06f8e9419b
--- /dev/null
+++ b/metadata/de.enaikoon.android.keypadmapper3.txt
@@ -0,0 +1,40 @@
+Antifeatures:Tracking
+Categories:Navigation
+License:NewBSD
+Web Site:http://wiki.openstreetmap.org/wiki/Keypad-Mapper_3
+Source Code:https://github.com/msemm/Keypad-Mapper-3
+Issue Tracker:
+
+Auto Name:Keypad-Mapper 3
+Summary:OSM Data Collection
+Description:
+Keypad-Mapper 3 makes it easy for you to record the GPS coordinates of house
+numbers for adding them later to OpenStreetMap.
+
+Features:
+* records house numbers
+* saves address data
+* takes GPS photos for entering in JOSM
+* indicates the GPS reception strength of GPS and GLONASS
+* exports the recorded information
+
+Note that although it's not mentioned anywhere except very deep in the help
+page, this application collects and uploads GSM cell data. See
+[https://f-droid.org/repository/issues/?do=view_issue&issue=421 here] for
+more information.
+.
+
+Repo Type:git
+Repo:https://github.com/msemm/Keypad-Mapper-3.git
+
+Build:3.1.00,47
+    commit=0c81f1
+    subdir=KeypadMapper3
+    init=sed -i 's/\\\\/\//g' project.properties
+    update=.;../actionbarsherlock;../enaikoon_resources_lib
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:3.1.00
+Current Version Code:47
+
diff --git a/metadata/de.fmaul.android.cmis.txt b/metadata/de.fmaul.android.cmis.txt
index dd0c6aae64..0782901dc6 100644
--- a/metadata/de.fmaul.android.cmis.txt
+++ b/metadata/de.fmaul.android.cmis.txt
@@ -1,29 +1,29 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/android-cmis-browser/
-Source Code:http://code.google.com/p/android-cmis-browser/source/checkout
-Issue Tracker:http://code.google.com/p/android-cmis-browser/issues/list
+Source Code:http://code.google.com/p/android-cmis-browser/source
+Issue Tracker:http://code.google.com/p/android-cmis-browser/issues
 
 Auto Name:CMIS Browser
 Summary:Enterprise CM browser
 Description:
 Access content from repositories that support the CMIS protocol, like Alfresco or Nuxeo.
 CMIS = Content Management Interoperability Services.
-- browsing the CMIS repository
-- viewing and sharing documents
-- title or fulltext search
-- Favorites
-- Multiple Repositories
+* browsing the CMIS repository
+* viewing and sharing documents
+* title or fulltext search
+* Favorites
+* Multiple Repositories
 .
 
 Repo Type:hg
 Repo:https://android-cmis-browser.googlecode.com/hg/
 
-Build Version:0.9.6,8,c729ad2dc80c
+Build:0.9.6,8
+	commit=release 0.9.6
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.9.6
 Current Version Code:8
 
diff --git a/metadata/de.freewarepoint.whohasmystuff.txt b/metadata/de.freewarepoint.whohasmystuff.txt
index 5f28aa4a74..66ad2121bf 100644
--- a/metadata/de.freewarepoint.whohasmystuff.txt
+++ b/metadata/de.freewarepoint.whohasmystuff.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/stovocor/whohasmystuff
 Source Code:https://github.com/stovocor/whohasmystuff
diff --git a/metadata/de.geeksfactory.opacclient.txt b/metadata/de.geeksfactory.opacclient.txt
index 0503906595..80aaf48db0 100644
--- a/metadata/de.geeksfactory.opacclient.txt
+++ b/metadata/de.geeksfactory.opacclient.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:MIT
 Web Site:http://opacapp.de/
 Source Code:https://github.com/raphaelm/opacclient
diff --git a/metadata/de.grobox.blitzmail.txt b/metadata/de.grobox.blitzmail.txt
index 2171a98a83..06220abe23 100644
--- a/metadata/de.grobox.blitzmail.txt
+++ b/metadata/de.grobox.blitzmail.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:AGPLv3+
 Web Site:https://github.com/grote/BlitzMail#blitzmail
 Source Code:https://github.com/grote/BlitzMail
@@ -6,13 +6,16 @@ Issue Tracker:https://github.com/grote/BlitzMail/issues
 FlattrID:1217295
 
 Auto Name:BlitzMail
-Summary:Share content via email
+Summary:Share content and notes via email
 Description:
 BlitzMail is an Android app that allows you to set up your email account once
-and then use it to send emails to an address of your choice. This comes in
-handy when you need to send a lot of things via email, because you are in a
-low connectivity area (e.g. subway) and want to remember things to look at
-later.
+and then use it to send emails or short notes to an address of your choice.
+This comes in handy when you need to send a lot of things via email,
+because you are in a low connectivity area (e.g. subway)
+and want to remember things to look at later.
+
+It also works when you are offline.
+BlitzMail then queues your emails and allows you to send them later when you have connectivity again.
 
 The SMTP password is stored encrypted with a built-in key and salted with your
 device ID. This is not fully secure, but should provide reasonable protection
@@ -25,15 +28,24 @@ Repo:https://github.com/grote/BlitzMail.git
 Build Version:0.1,1,0.1,target=android-17,prebuild=\
 cp src/de/grobox/blitzmail/PrivateConstants.sample_java src/de/grobox/blitzmail/PrivateConstants.java && \
 sed -i -e 's/\[Please insert your encryption key here\]/Angooh1Kieph8ait0Paik9Usee3shouj/' src/de/grobox/blitzmail/PrivateConstants.java
-Build Version:0.2,2,0.2,target=android-17,prebuild=\
-cp src/de/grobox/blitzmail/PrivateConstants.sample_java src/de/grobox/blitzmail/PrivateConstants.java && \
-sed -i -e 's/\[Please insert your encryption key here\]/Angooh1Kieph8ait0Paik9Usee3shouj/' src/de/grobox/blitzmail/PrivateConstants.java
 Build Version:0.3,3,0.3,target=android-17,prebuild=\
 cp src/de/grobox/blitzmail/PrivateConstants.sample_java src/de/grobox/blitzmail/PrivateConstants.java && \
 sed -i -e 's/\[Please insert your encryption key here\]/Angooh1Kieph8ait0Paik9Usee3shouj/' src/de/grobox/blitzmail/PrivateConstants.java
 
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.3
-Current Version Code:3
+Build:0.4,4
+    commit=0.4
+    target=18
+    prebuild=cp src/de/grobox/blitzmail/PrivateConstants.sample_java src/de/grobox/blitzmail/PrivateConstants.java && \
+             sed -i -e 's/\[Please insert your encryption key here\]/Angooh1Kieph8ait0Paik9Usee3shouj/' src/de/grobox/blitzmail/PrivateConstants.java
+
+Build:0.5,5
+    commit=0.5
+    prebuild=cp src/de/grobox/blitzmail/PrivateConstants.sample_java src/de/grobox/blitzmail/PrivateConstants.java && \
+             sed -i -e 's/\[Please insert your encryption key here\]/Angooh1Kieph8ait0Paik9Usee3shouj/' src/de/grobox/blitzmail/PrivateConstants.java
+    gradle=normal
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:0.5
+Current Version Code:5
 
diff --git a/metadata/de.grobox.liberario.txt b/metadata/de.grobox.liberario.txt
index 9f650325ca..9f992c1ae8 100644
--- a/metadata/de.grobox.liberario.txt
+++ b/metadata/de.grobox.liberario.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3+
 Web Site:https://github.com/grote/Liberario#liberario
 Source Code:https://github.com/grote/Liberario
@@ -8,19 +8,51 @@ FlattrID:1921242
 Auto Name:Liberario
 Summary:Public transport routing
 Description:
-A public transport routing application that finds trips from one station to another.
+A public transport app that works mostly in Europe, but also in California, Philadelphia, Sydney and other places.
 
-Status: Alpha. There might still be many bugs and a lot of functionality is still missing. Please report issues if you find any.
+It finds connections from your home, current position or given station to wherever you want to go.
+Locations are automatically saved and shown with the most used on top.
+You can also save entire connections as favorites and find next trips with one click.
+
+The app can find nearby stations and show upcoming departures including the delays (if there are any).
 .
 
 Repo Type:git
 Repo:https://github.com/grote/Liberario.git
 
-Build Version:0.1,1,0.1,submodules=yes,update=.;sublibs/Android-PullToRefresh/library,build=./build-pte.sh
-Build Version:0.2,2,0.2,submodules=yes,build=./build-pte.sh
+Build:0.1,1
+    commit=0.1
+    submodules=yes
+    update=.;sublibs/Android-PullToRefresh/library
+    build=./build-pte.sh
+
+Build:0.2,2
+    commit=0.2
+    submodules=yes
+    build=./build-pte.sh
+
+Build:0.2.1,3
+    commit=0.2.1
+    submodules=yes
+    build=./build-pte.sh
+
+Build:0.3,4
+    commit=0.3
+    submodules=yes
+    build=./build-pte.sh
+
+Build:0.3.1,5
+    commit=0.3.1
+    submodules=yes
+    build=./build-pte.sh
+
+Build:0.4,6
+    commit=0.4
+    submodules=yes
+    build=./build-pte.sh
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.2
-Current Version Code:2
+Current Version:0.4
+Current Version Code:6
 
diff --git a/metadata/de.hechler.andfish.txt b/metadata/de.hechler.andfish.txt
new file mode 100644
index 0000000000..6236d99097
--- /dev/null
+++ b/metadata/de.hechler.andfish.txt
@@ -0,0 +1,20 @@
+Category:Games
+License:Apache2
+Source Code:http://svn.code.sf.net/p/feri/svn/trunk/AndFish
+
+Summary:Simple game
+Description:
+Guide your fish to eat the other fish and grow bigger.
+.
+
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/feri/svn/trunk/AndFish
+
+Build:1.3,20
+    disable=Wrong version code and doesn't work anyway
+    commit=6
+
+Update Check Mode:None
+Current Version:1.3
+Current Version Code:6
+
diff --git a/metadata/de.homac.Mirrored.txt b/metadata/de.homac.Mirrored.txt
index 5bd46a6765..a54e287696 100644
--- a/metadata/de.homac.Mirrored.txt
+++ b/metadata/de.homac.Mirrored.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://gitorious.org/mirrored/pages/Home
 Source Code:https://gitorious.org/mirrored/mirrored
@@ -17,12 +17,19 @@ official application from "Spiegel Online".
 Repo Type:git
 Repo:https://git.gitorious.org/mirrored/mirrored.git
 
-Build Version:0.2.0,6,v0.2,target=android-8
-Build Version:0.2.3,9,a0d398ac2017cf
+Build:0.2.0,6
+    commit=v0.2
+    target=android-8
+
+Build:0.2.3,9
+    commit=a0d398ac2017cf
+
+Build:0.2.5,11
+    commit=v0.2.5
+	gradle=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.2.3
-Current Version Code:9
+Update Check Mode:Tags
+Current Version:0.2.5
+Current Version Code:11
 
diff --git a/metadata/de.j4velin.systemappmover.txt b/metadata/de.j4velin.systemappmover.txt
new file mode 100644
index 0000000000..52625bb4d0
--- /dev/null
+++ b/metadata/de.j4velin.systemappmover.txt
@@ -0,0 +1,38 @@
+Categories:System
+License:Apache2
+Web Site:https://github.com/j4velin/SystemAppMover
+Source Code:https://github.com/j4velin/SystemAppMover
+Issue Tracker:https://github.com/j4velin/SystemAppMover/issues
+
+Auto Name:/system/app mover
+Summary:Add and remove system apps
+Description:
+This app moves apps from and to the /system/app folder, making them a system
+app or a user app. System apps can get more priviledges, so some apps get more
+functionality when installed as a system app.
+
+On the other hand, system apps can not be uninstalled. So this app can also be
+used to convert system apps to normal user apps by moving them from the
+/system/app directory to /data/app directory.
+
+WARNING: Uninstalling important system apps might result in a unusable device!
+Use this function at your own risk and only if you know what you're doing!
+
+This app requires a rooted device with BusyBox installed.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/j4velin/SystemAppMover.git
+
+Build:1.5.6,19
+    commit=457e6d661b726d5
+    target=android-19
+    srclibs=1:RootTools@253
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5.6
+Current Version Code:19
+
diff --git a/metadata/de.jdsoft.law.txt b/metadata/de.jdsoft.law.txt
index 3a45eac924..dee603407d 100644
--- a/metadata/de.jdsoft.law.txt
+++ b/metadata/de.jdsoft.law.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:
 Source Code:https://github.com/jfreax/OpenLaw
diff --git a/metadata/de.joergjahnke.c64.android.txt b/metadata/de.joergjahnke.c64.android.txt
index 95c5d432f6..1d084ef5b7 100644
--- a/metadata/de.joergjahnke.c64.android.txt
+++ b/metadata/de.joergjahnke.c64.android.txt
@@ -1,5 +1,5 @@
 Disabled:Field-of-use restriction issues with included ROM binary
-Category:Games
+Categories:Games
 License:GPL
 Web Site:http://jmec64.sourceforge.net/
 Source Code:http://sourceforge.net/projects/jmec64/develop
@@ -12,7 +12,6 @@ A Commodore 64 (C64) emulator.
 .
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.6.16
 Current Version Code:10616
diff --git a/metadata/de.jurihock.voicesmith.txt b/metadata/de.jurihock.voicesmith.txt
index 083856bb9a..3738b03859 100644
--- a/metadata/de.jurihock.voicesmith.txt
+++ b/metadata/de.jurihock.voicesmith.txt
@@ -1,40 +1,66 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3+
 Web Site:http://voicesmith.jurihock.de/
 Source Code:http://github.com/jurihock/voicesmith
 Issue Tracker:http://github.com/jurihock/voicesmith/issues
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RDZAFKVYQJYFA
 
 Auto Name:Voicesmith
 Summary:Real-time voice changer
 Description:
-Voicesmith records an audio signal from the built-in microphone, processes it in some
- way and plays it back through the earphones. There are some of the classical Phase
-Vocoder effects available. Voicesmith can also be used to perform the Delayed Auditory
-Feedback (DAF) and Frequency-Shifted Auditory Feedback (FAF).
+Voicesmith records an audio signal from the built-in microphone, processes it
+in some way and plays it back through the earphones in real-time. There are
+some of the classical Phase Vocoder effects available. Voicesmith can also
+be used to perform the Delayed Auditory Feedback (DAF) and
+Frequency-Shifted Auditory Feedback (FAF).
 .
 
 Repo Type:git
 Repo:git://github.com/jurihock/voicesmith.git
 
-# Unsupported build versions <= 2.0
-Build Version:1.1,1,!automated build unsupported
-Build Version:1.2,2,!automated build unsupported
-Build Version:1.2.1,3,!automated build unsupported
-Build Version:1.3,4,!automated build unsupported
-Build Version:1.4,5,!automated build unsupported
-Build Version:2.0,6,!automated build unsupported
 # Supported build version 2.1
 # (but custom commit number, not the tagged one)
-Build Version:2.1,7,21e96e1cd,submodules=yes,subdir=voicesmith,\
-update=.;../greendroid/GreenDroid,target=android-8,buildjni=yes
+Build:2.1,7
+    commit=21e96e1cd
+    subdir=voicesmith
+    submodules=yes
+    target=android-8
+    update=.;../greendroid/GreenDroid
+    buildjni=yes
+
 # Build versions >= 2.2 are compatible with tags mode
-Build Version:2.2,8,v2.2_r8,submodules=yes,subdir=voicesmith,\
-update=.;../greendroid/GreenDroid,target=android-8,buildjni=yes
-Build Version:2.3,9,v2.3_r9,submodules=yes,subdir=voicesmith,\
-update=.;../greendroid/GreenDroid,target=android-8,buildjni=yes
+Build:2.2,8
+    commit=v2.2_r8
+    subdir=voicesmith
+    submodules=yes
+    target=android-8
+    update=.;../greendroid/GreenDroid
+    buildjni=yes
+
+Build:2.3,9
+    commit=v2.3_r9
+    subdir=voicesmith
+    submodules=yes
+    target=android-8
+    update=.;../greendroid/GreenDroid
+    buildjni=yes
+
+Build:2.4,10
+    commit=v2.4_r10
+    subdir=voicesmith
+    submodules=yes
+    target=android-8
+    update=.;../greendroid/GreenDroid
+    buildjni=yes
+
+Build:2.5,11
+    commit=v2.5_r11
+    subdir=voicesmith
+    submodules=yes
+    buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.3
-Current Version Code:9
+Current Version:2.5
+Current Version Code:11
 
diff --git a/metadata/de.koelle.christian.trickytripper.txt b/metadata/de.koelle.christian.trickytripper.txt
new file mode 100644
index 0000000000..63fda78dba
--- /dev/null
+++ b/metadata/de.koelle.christian.trickytripper.txt
@@ -0,0 +1,25 @@
+Categories:Office
+License:Apache2
+Web Site:http://tricktripper.blogspot.de
+Source Code:https://github.com/koelleChristian/trickytripper
+Issue Tracker:https://github.com/koelleChristian/trickytripper/issues
+
+Auto Name:Tricky Tripper
+Summary:Manage travel expenses
+Description:
+Especially for managing shared expenses
+.
+
+Repo Type:git
+Repo:https://github.com/koelleChristian/trickytripper.git
+
+Build:1.4.2,12
+    commit=c1f7c
+    subdir=trickytripper-app
+    srclibs=1:ActionBarSherlock@4.2.0
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.4.2
+Current Version Code:12
+
diff --git a/metadata/de.kugihan.dictionaryformids.hmi_android.txt b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
index 1deffdc7ef..aeb95b0b84 100644
--- a/metadata/de.kugihan.dictionaryformids.hmi_android.txt
+++ b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2+
 Web Site:http://dictionarymid.sourceforge.net/android.html
 Source Code:http://dictionarymid.sourceforge.net/android.html
@@ -23,14 +23,23 @@ the section dictionaries for download of the website.
 .
 
 Repo Type:git-svn
-Repo:https://dictionarymid.svn.sourceforge.net/svnroot/dictionarymid/trunk
+# trunk+tags take ages to clone
+Repo:https://svn.code.sf.net/p/dictionarymid/code/trunk
 
-Build Version:0.91.1,98,561,subdir=Android,prebuild=\
-mv -f ../DictionaryForMIDs/src/de/kugihan/dictionaryformids/* src/de/kugihan/
+Build:0.91.1,98
+    commit=561
+	subdir=Android
+    prebuild=mv -f ../DictionaryForMIDs/src/de/kugihan/dictionaryformids/* src/de/kugihan/
+
+Build:0.92.3,103
+	disable=won't build
+	subdir=Android
+    commit=662
+	gradle=yes
+	prebuild=sed -i '/releaseSigning ==/{N;N;d}' build.gradle
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.92
-Current Version Code:100
+Update Check Mode:RepoManifest
+Current Version:0.92.3
+Current Version Code:103
 
diff --git a/metadata/de.laxu.apps.nachtlagerdownloader.txt b/metadata/de.laxu.apps.nachtlagerdownloader.txt
new file mode 100644
index 0000000000..710d8fc2f1
--- /dev/null
+++ b/metadata/de.laxu.apps.nachtlagerdownloader.txt
@@ -0,0 +1,22 @@
+Category:Multimedia
+License:GPLv3
+Web Site:http://nachtlager.de
+Source Code:https://github.com/allo-/NachtlagerDownloader
+Issue Tracker:https://github.com/allo-/NachtlagerDownloader/issues
+
+Auto Name:Nachtlager Downloader
+Summary:Download a particular podcast
+Description:
+App for the Domian podcast.
+.
+
+Repo Type:git
+Repo:https://github.com/allo-/NachtlagerDownloader.git
+
+Build Version:1.0,1,v1.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/de.luhmer.owncloudnewsreader.txt b/metadata/de.luhmer.owncloudnewsreader.txt
index 5a2fe2ee76..1b2594cef1 100644
--- a/metadata/de.luhmer.owncloudnewsreader.txt
+++ b/metadata/de.luhmer.owncloudnewsreader.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:AGPLv3+
 Web Site:
 Source Code:https://github.com/owncloud/News-Android-App
@@ -18,46 +18,104 @@ Status: Beta
 Repo Type:git
 Repo:https://github.com/owncloud/News-Android-App.git
 
-Build Version:0.3.7,20,7db2de9ebeee8b441c3726f,\
-srclibs=ActionBarSherlock@4.3.1;PullToRefresh@d18bb778edad9,rm=OwncloudNewsReader.apk,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.3.8,21,c7be06e5e89cb2771861888,\
-srclibs=ActionBarSherlock@4.3.1;PullToRefresh@d18bb778edad9,rm=OwncloudNewsReader.apk,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.3.9,22,cc37f084b364e73508,\
-srclibs=ActionBarSherlock@4.3.1;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.4.3,26,050b9b75b5cea3b4a8f3202371,\
-srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.4.7,30,994d32cc,\
-srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.4.7,30,994d32cc,\
-srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
-prebuild=\
-    echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-    echo "android.library.reference.2=$$PullToRefresh$$" >> project.properties && \
-    cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-Build Version:0.4.10,33,!missing libs 0.4.10,\
-srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
-prebuild=\
-    echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-    echo "android.library.reference.2=$$PullToRefresh$$" >> project.properties && \
-    cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+Build:0.3.7,20
+    commit=7db2de9ebeee8b441c3726f
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.3.1;PullToRefresh@d18bb778edad9
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.3.8,21
+    commit=c7be06e5e89cb2771861888
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.3.1;PullToRefresh@d18bb778edad9
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.3.9,22
+    commit=cc37f084b364e73508
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.3.1;PullToRefresh@319024754481f23e
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.4.3,26
+    commit=050b9b75b5cea3b4a8f3202371
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.4.7,30
+    commit=994d32cc
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.4.7,30
+    commit=994d32cc
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$PullToRefresh$$" >> project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.4.10,33
+    disable=missing libs 0.4.10
+    commit=unknown - see disabled
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$PullToRefresh$$" >> project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.5.2,37
+    commit=0.5.2
+    rm=OwncloudNewsReader.apk
+    srclibs=ActionBarSherlock@4.4.0;PullToRefresh@319024754481f23e;AppRater@v1.0.8;ChangeLog@v1.3.0;MessageBar@8c0068385a
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$PullToRefresh$$" >> project.properties && \
+        echo "android.library.reference.3=$$AppRater$$" >> project.properties && \
+        echo "android.library.reference.4=$$ChangeLog$$" >> project.properties && \
+        echo "android.library.reference.5=$$MessageBar$$" >> project.properties && \
+        (cd $$ChangeLog$$ && \
+        echo -e 'android.library=true\ntarget=android-18' > project.properties && \
+        mv src old && \
+        mv old/main/java src && \
+        mv old/main/res res && \
+        mv old/main/AndroidManifest.xml . && \
+        $$SDK$$/tools/android update project -p .) && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.5.4,39
+    commit=v0.5.4
+    rm=OwncloudNewsReader.apk
+    srclibs=1:ActionBarSherlock@4.4.0;2:PullToRefresh@319024754481f23e;3:AppRater@v1.0.8;4:ChangeLog@v1.3.0;5:MessageBar@8c0068385a
+    prebuild=(cd $$ChangeLog$$ && \
+        echo -e 'android.library=true\ntarget=android-18' > project.properties && \
+        mv src old && \
+        mv old/main/java src && \
+        mv old/main/res res && \
+        mv old/main/AndroidManifest.xml . && \
+        $$SDK$$/tools/android update project -p .) && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:0.5.5,40
+    disable=beta
+    commit=v0.5.5
+
+Maintainer Notes:
+Releases are usually (not always) tagged. Tag names are erratic.
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.4.10
-Current Version Code:33
+Current Version:0.5.5
+Current Version Code:40
 
diff --git a/metadata/de.mangelow.network.txt b/metadata/de.mangelow.network.txt
index a4b69aa22a..230d829887 100644
--- a/metadata/de.mangelow.network.txt
+++ b/metadata/de.mangelow.network.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/scheich/Network
 Source Code:https://github.com/scheich/Network
@@ -16,12 +16,10 @@ find a 2G signal all the time. The PRL choices only apply to operators that keep
 Repo Type:git
 Repo:https://github.com/scheich/Network.git
 
-#Not well documented
 Build Version:1.02,3,df1c1ce4f113da84
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.02
 Current Version Code:3
 
diff --git a/metadata/de.markusfisch.android.wavelines.txt b/metadata/de.markusfisch.android.wavelines.txt
new file mode 100644
index 0000000000..5b09aa54c0
--- /dev/null
+++ b/metadata/de.markusfisch.android.wavelines.txt
@@ -0,0 +1,23 @@
+Categories:Wallpaper
+License:MIT
+Web Site:http://markusfisch.de
+Source Code:https://github.com/markusfisch/WaveLinesWallpaper
+Issue Tracker:https://github.com/markusfisch/WaveLinesWallpaper/issues
+
+Auto Name:Wave Lines
+Summary:Wavy wallpaper
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/markusfisch/WaveLinesWallpaper.git
+
+Build:1.2.0,3
+    commit=v1.2.0
+    init=cat ant.properties >> project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.2.0
+Current Version Code:3
+
diff --git a/metadata/de.mbutscher.wikiandpad.alphabeta.txt b/metadata/de.mbutscher.wikiandpad.alphabeta.txt
index 6885d048a8..be67dbed53 100644
--- a/metadata/de.mbutscher.wikiandpad.alphabeta.txt
+++ b/metadata/de.mbutscher.wikiandpad.alphabeta.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://wikidpad.sourceforge.net/WikiAndPad.html
 Source Code:http://svnandroid.wikidpad2.webfactional.com/
@@ -10,14 +10,16 @@ Auto Name:WikiAndPad alpha/beta
 Summary:WikidPad for Android
 Description:
 WikidPad is a Wiki-like notebook for storing your thoughts, ideas, todo lists,
-contacts, or anything else you can think of to write down. It is Open Source
-and available for Windows (binary installer) and Linux and Mac OS (as Python
-source). You can clip snippets from a browser, syntax-highlight wiki words and
-search notes. This app is in the early stages of development so is considered
-alpha. WikidAndPad uses text files indexed by a
-database stored on your sdcard, but it is currently not possible to create the
-database from within the app. First, you must create the database of the type
-Original Sqlite within WikidPad on the desktop and copy it to your sdcard.
+contacts, or anything else you can think of to write down. It is also available
+for Windows (binary installer) and Linux and Mac OS (as Python source). You can
+clip snippets from a browser, syntax-highlight wiki words and search notes.
+
+This app is in the early stages of development so is considered alpha.
+
+WikidAndPad uses text files indexed by a database stored on your sdcard, but it
+is currently not possible to create the database from within the app. First,
+you must create the database of the type Original Sqlite within WikidPad on the
+desktop and copy it to your sdcard.
 .
 
 Repo Type:git-svn
diff --git a/metadata/de.onyxbits.drudgery.txt b/metadata/de.onyxbits.drudgery.txt
new file mode 100644
index 0000000000..d38434ed2c
--- /dev/null
+++ b/metadata/de.onyxbits.drudgery.txt
@@ -0,0 +1,39 @@
+Categories:Games
+License:Apache2
+Web Site:http://www.onyxbits.de
+Source Code:https://github.com/onyxbits/Drudgery
+Issue Tracker:https://github.com/onyxbits/Drudgery/issues
+
+Auto Name:Drudgery
+Summary:Widget-based game
+Description:
+Drudge Quest is a simple memory game the objective of which is to
+to get through the day while trying to avoid running into your boss as you 
+move from room to room along the 'Escher Hallway' of your company's office 
+building.
+
+The game is played via a homescreen or dashclock widget.
+.
+
+Repo Type:git
+Repo:https://github.com/onyxbits/Drudgery.git
+
+Build:1.1,2
+    commit=v1.1
+    extlibs=android/android-support-v4r13.jar
+    srclibs=DashClock@ecb5a191880
+    prebuild=rm custom_rules.xml && \
+        echo 'source.dir=src;$$DashClock$$/api/src/main/java;$$DashClock$$/api/src/main/aidl' >> project.properties
+
+Build:1.3,4
+    commit=v1.3
+    extlibs=android/android-support-v4r13.jar
+    srclibs=DashClock@ecb5a191880
+    prebuild=rm custom_rules.xml && \
+        echo 'source.dir=src;$$DashClock$$/api/src/main/java;$$DashClock$$/api/src/main/aidl' >> project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3
+Current Version Code:4
+
diff --git a/metadata/de.onyxbits.listmyapps.txt b/metadata/de.onyxbits.listmyapps.txt
index e50a8b321d..0421741a6e 100644
--- a/metadata/de.onyxbits.listmyapps.txt
+++ b/metadata/de.onyxbits.listmyapps.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/onyxbits/listmyaps
 Source Code:https://github.com/onyxbits/listmyaps
@@ -14,14 +14,37 @@ sharing.
 Repo Type:git
 Repo:https://github.com/onyxbits/listmyaps.git
 
-Build Version:1.2,3,v1.2,target=android-17,rm=custom_rules.xml
-Build Version:1.3,4,v1.3,rm=custom_rules.xml
-Build Version:2.0,5,v2.0,rm=custom_rules.xml,extlibs=android/android-support-v4.jar
-Build Version:2.1,6,v2.1,rm=custom_rules.xml,extlibs=android/android-support-v4.jar
-Build Version:2.2,7,v2.2,rm=custom_rules.xml,extlibs=android/android-support-v4.jar
+Build:1.2,3
+    commit=v1.2
+    target=android-17
+    rm=custom_rules.xml
 
-Auto Update Mode:None
+Build:1.3,4
+    commit=v1.3
+    rm=custom_rules.xml
+
+Build:2.0,5
+    commit=v2.0
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Build:2.1,6
+    commit=v2.1
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Build:2.2,7
+    commit=v2.2
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Build:2.3,8
+    commit=v2.3
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.2
-Current Version Code:7
+Current Version:2.3
+Current Version Code:8
 
diff --git a/metadata/de.onyxbits.pocketbandit.txt b/metadata/de.onyxbits.pocketbandit.txt
index c7b2a5ef5f..5bd41dca43 100644
--- a/metadata/de.onyxbits.pocketbandit.txt
+++ b/metadata/de.onyxbits.pocketbandit.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:http://www.onyxbits.de/pocketbandit
 Source Code:https://github.com/onyxbits/pocketbandit
@@ -19,12 +19,21 @@ Pull the lever to spin the reels and push it up to stop them spinning.
 Repo Type:git
 Repo:https://github.com/onyxbits/pocketbandit.git
 
-Build Version:1.1,2,62dc5d59,extlibs=libgdx/libgdx-0.9.7.zip,prebuild=\
-rm -rf raw-data && unzip libs/libgdx-0.9.7.zip -d libs/ && rm libs/libgdx-0.9.7.zip
+Build:1.1,2
+    commit=62dc5d59
+    extlibs=libgdx/libgdx-0.9.7.zip
+    prebuild=rm -rf raw-data && \
+        unzip libs/libgdx-0.9.7.zip -d libs/ && \
+        rm libs/libgdx-0.9.7.zip
+
+Build:1.2,3
+    commit=d95e8a9aee7f
+	disable=use libgdx sensibly, test
+    extlibs=libgdx/libgdx-0.9.7.zip
+    rm=raw-data;custom_rules.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1
-Current Version Code:2
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3
 
diff --git a/metadata/de.onyxbits.remotekeyboard.txt b/metadata/de.onyxbits.remotekeyboard.txt
index ff9f2b241a..db30c64589 100644
--- a/metadata/de.onyxbits.remotekeyboard.txt
+++ b/metadata/de.onyxbits.remotekeyboard.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/onyxbits/remotekeyboard
diff --git a/metadata/de.onyxbits.sensorreadout.txt b/metadata/de.onyxbits.sensorreadout.txt
index 0aa7e0e04c..a7aa89e017 100644
--- a/metadata/de.onyxbits.sensorreadout.txt
+++ b/metadata/de.onyxbits.sensorreadout.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://www.onyxbits.de/node/695
 Source Code:https://github.com/onyxbits/sensorreadout
@@ -14,12 +14,21 @@ side by side comparison with other devices
 Repo Type:git
 Repo:https://github.com/onyxbits/sensorreadout.git
 
-Build Version:1.1,2,!source incomplete at 344afe422eb9,extlibs=achartlib/achartengine-1.0.0.jar
-Build Version:1.2,3,0d0812da8c,extlibs=achartlib/achartengine-1.0.0.jar
+Build:1.1,2
+    disable=source incomplete at 344afe422eb9
+    commit=344afe422eb9
+    extlibs=achartlib/achartengine-1.0.0.jar
+
+Build:1.2,3
+    commit=0d0812da8c
+    extlibs=achartlib/achartengine-1.0.0.jar
+
+Build:2.1,5
+    commit=v2.1
+	rm=custom_rules.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.2
-Current Version Code:3
+Update Check Mode:Tags
+Current Version:2.1
+Current Version Code:5
 
diff --git a/metadata/de.onyxbits.textfiction.txt b/metadata/de.onyxbits.textfiction.txt
new file mode 100644
index 0000000000..83132e0d1d
--- /dev/null
+++ b/metadata/de.onyxbits.textfiction.txt
@@ -0,0 +1,31 @@
+Categories:Games
+License:Apache2
+Web Site:http://www.onyxbits.de/textfiction
+Source Code:https://github.com/onyxbits/TextFiction
+Issue Tracker:https://github.com/onyxbits/TextFiction/issues
+
+Auto Name:Text Fiction
+Summary:Interactive fiction interpreter
+Description:
+ZPlet based Z-Machine interpreter for playing text-only adventures games. 
+The interface is like an SMS app
+and there's a list of buttons for common actions as well as the ability
+to select text from the page to be an action.
+
+Supports games in Z3, Z5, Z8 format and games can be download in the app.
+Savegames are kept on the sdcard.
+.
+
+Repo Type:git
+Repo:https://github.com/onyxbits/TextFiction.git
+
+Build:1.2,3
+    commit=v1.2
+    rm=custom_rules.xml
+    extlibs=android/android-support-v4.jar
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.0
+Current Version Code:4
+
diff --git a/metadata/de.qspool.clementineremote.txt b/metadata/de.qspool.clementineremote.txt
new file mode 100644
index 0000000000..0315bb9ef1
--- /dev/null
+++ b/metadata/de.qspool.clementineremote.txt
@@ -0,0 +1,46 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/clementine-remote-android/
+Source Code:https://github.com/clementine-player/Android-Remote
+Issue Tracker:https://github.com/clementine-player/Android-Remote/issues
+
+Auto Name:Clementine Remote
+Summary:Music player remote control
+Description:
+You need [http://www.clementine-player.org/downloads Clementine]
+1.2.1 (quite recent) for this to work and to enable the remote Control 
+in Clementine settings first.
+
+Control the music player "Clementine" - access your playlists, 
+browse the library, download files, change the volume via hardware buttons,
+read the lyrics while listening to your favourite song, enjoy the cover art and more.
+
+If you receive a call or want to make one, you don't have pause the current 
+track, Clementine Remote can lower the volume for you. 
+It also has many more features, for example exchange of music and playlists with a computer.
+
+[https://raw.github.com/clementine-player/Android-Remote/master/changelog.txt Changelog]
+.
+
+Repo Type:git
+Repo:https://github.com/clementine-player/Android-Remote
+
+Build:8.2,25
+    commit=v8.2
+    extlibs=jmdns-build.xml
+    srclibs=ClementineDeps@737bf
+    prebuild=echo 'source.dir=src;$$ClementineDeps$$/clementine-remote-android.dep-protocolbuffer/src' > ant.properties && \
+        sed -i 's@\(reference.1=\).*@\1$$ClementineDeps$$/clementine-remote-android.dep-abs@' project.properties && \
+        mkdir unjar/ && \
+        cp -r $$ClementineDeps$$/clementine-remote-android.dep-jmdns/src/javax/ libs/ && \
+        rm -rf libs/javax/jmdns/test/
+    build=ant jar -f libs/jmdns-build.xml && \
+        cd unjar/ && \
+        jar xf ../libs/jmdns.jar && \
+        jar cfm ../libs/jmdns.jar META-INF/MANIFEST.MF javax/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:8.5
+Current Version Code:28
+
diff --git a/metadata/de.schaeuffelhut.android.openvpn.txt b/metadata/de.schaeuffelhut.android.openvpn.txt
index 791bb68778..25b434d61c 100644
--- a/metadata/de.schaeuffelhut.android.openvpn.txt
+++ b/metadata/de.schaeuffelhut.android.openvpn.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://code.google.com/p/android-openvpn-settings
-Source Code:https://code.google.com/p/android-openvpn-settings/source/list
-Issue Tracker:https://code.google.com/p/android-openvpn-settings/issues/list
+Source Code:https://code.google.com/p/android-openvpn-settings/source
+Issue Tracker:https://code.google.com/p/android-openvpn-settings/issues
 Donate:https://code.google.com/p/android-openvpn-settings
 FlattrID:621822
 
diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 1549880ef3..1652f2f604 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -1,14 +1,13 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
-Source Code:http://code.google.com/p/bitcoin-wallet/source/list?name=prod
-Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
+Source Code:http://code.google.com/p/bitcoin-wallet/source
+Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues
 Bitcoin:1HkX6X8EakdsgAysL93oKrWiXGPbFiG1xV
 
-Auto Name:Testnet3
+Auto Name:Bitcoin
 Summary:Store digital currency
 Description:
-'''Important [http://bitcoin.org/en/alert/2013-08-11-android bug fix] in 3.15'''
 * No cloud server or web service needed: this wallet works peer to peer
 * Display of wallet balance in Bitcoin and various other currencies
 * Sending and receiving of Bitcoin via NFC, QR-codes or Bitcoin URLs
@@ -46,65 +45,128 @@ Repo:https://code.google.com/p/bitcoin-wallet/
 #Note: there used to be build data for 1.48.2/66 but the source code for this
 #seems to have gone (it was in a maintenance branch) when the project went
 #from svn to git.
-Build Version:2.01,74,a55ef6822c9e,subdir=wallet,maven=yes,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@31953d239555,\
-init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;,\
-prebuild=\
-mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:2.16,87,49c3da045e57,subdir=wallet,maven=2,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@a160dc24f38c,\
-init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;,\
-prebuild=\
-cd ../integration-android && mvn3 install && cd ../wallet && \
-mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:3.01,121,742241f59df1,maven=yes,patch=pom.patch,\
-bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
-sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
-cp -r $$BitcoinJWallet$$/ . && rm -rf market/
-Build Version:3.04,124,3efa5beb206e,maven=yes,patch=pom.patch,\
-bindir=wallet/target,srclibs=BitcoinJWallet@7cb7bfc11c11,prebuild=\
-cp -r $$BitcoinJWallet$$/ . && rm -rf market/
+Build:2.01,74
+    commit=a55ef6822c9e
+    subdir=wallet
+    init=sed -i 's/_test//' AndroidManifest.xml && \
+        find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;
+    maven=yes
+    srclibs=BitcoinJWallet@31953d239555
+    prebuild=mvn install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+        mvn install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+    bindir=wallet/target
+
+Build:2.16,87
+    commit=49c3da045e57
+    subdir=wallet
+    init=sed -i 's/_test//' AndroidManifest.xml && \
+        find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;
+    maven=2
+    srclibs=BitcoinJWallet@a160dc24f38c
+    prebuild=cd ../integration-android && \
+        mvn3 install && \
+        cd ../wallet && \
+        mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+        mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+    bindir=wallet/target
+
+Build:3.01,121
+    commit=742241f59df1
+    maven=yes
+    srclibs=BitcoinJWallet@1649520e3183
+    patch=pom.patch
+    prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    bindir=wallet/target
+
+Build:3.04,124
+    commit=3efa5beb206e
+    maven=yes
+    srclibs=BitcoinJWallet@7cb7bfc11c11
+    patch=pom.patch
+    prebuild=cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    bindir=wallet/target
+
 # source plugin causes an error after building: 
 # W/asset   (16561) Asset path target/library-4.1.0.apk is neither a directory nor file (type=1).
-Build Version:3.14,134,5ede628245a8,\
-srclibs=BitcoinJWallet@67b187c4c4c4,\
-prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
-         rm -rf market/,\
-build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml,\
-maven=yes,\
-bindir=wallet/target
-# important bugfix so uses the original BitcoinJ
-Build Version:3.15,136,dd70948b66aa,\
-srclibs=BitcoinJWallet-origin@777e6781d,\
-prebuild=sed -i '30\,33d' pom.xml && sed -i 's/0.11-SNAPSHOT/0.10/g' wallet/pom.xml && \
-         cp -r $$BitcoinJWallet-origin$$/ . && rm -rf market/,\
-build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml,\
-maven=yes,\
-bindir=wallet/target
-Build Version:3.19,140,885f13e01a86,\
-srclibs=BitcoinJWallet@1134572f61,\
-prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
-         rm -rf market/,\
-build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml,\
-maven=yes,\
-bindir=wallet/target
-Build Version:3.22,143,8e67f8ea6e38,\
-subdir=wallet,maven=yes@..,\
-srclibs=BitcoinJWallet@v0.10.2,\
-prebuild=\
-	cp -r $$BitcoinJWallet$$/ . && rm -rf ../market/ &&\
-	sed -i '/sample-integration-android/d' ../pom.xml,\
-build=\
-	$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
+Build:3.14,134
+    commit=5ede628245a8
+    maven=yes
+    srclibs=BitcoinJWallet@67b187c4c4c4
+    prebuild=sed -i '30,33d' pom.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+    bindir=wallet/target
+
+# important bugfix so uses the original BitcoinJ
+Build:3.15,136
+    commit=dd70948b66aa
+    maven=yes
+    srclibs=BitcoinJWallet-origin@777e6781d
+    prebuild=sed -i '30,33d' pom.xml && \
+        sed -i 's/0.11-SNAPSHOT/0.10/g' wallet/pom.xml && \
+        cp -r $$BitcoinJWallet-origin$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml
+    bindir=wallet/target
+
+Build:3.19,140
+    commit=885f13e01a86
+    maven=yes
+    srclibs=BitcoinJWallet@1134572f61
+    prebuild=sed -i '30,33d' pom.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
+    bindir=wallet/target
+
+Build:3.22,143
+    commit=8e67f8ea6e38
+    subdir=wallet
+    maven=yes@..
+    srclibs=BitcoinJWallet@v0.10.2
+    prebuild=cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf ../market/ &&	sed -i '/sample-integration-android/d' ../pom.xml
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
+
+Build:3.27,148
+    commit=5787167f05b8
+    subdir=wallet
+    maven=yes@..
+    rm=market/
+    srclibs=BitcoinJWallet-origin@v0.10.3
+    prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+
+Build:3.28,149
+    commit=f796d9531f2d
+    subdir=wallet
+    maven=yes@..
+    rm=market/
+    srclibs=BitcoinJWallet-origin@v0.10.3
+    prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+
+Maintainer Notes:
+See wallet/{README,CHANGES} or git log for info about what BitcoinJ tag to use.
+Use latest commit in 'prod' branch, which is a rebase on top of the latest tag.
+
+Ensure the developer has remembered to update name/icon in prod branch (as did
+not happen with 3.23, which appears to be why it was quickly replaced with 3.24.
+(For the same reason, there is no 3.24_test)
+
+Note also that the 'prod:' commits seem to disappear, as if the developer is
+removing them and force-pushing the branch. We need to take an alternative
+approach to building this in future.
+
+Update the _test app as well.
+.
 
-# See wallet/{README,CHANGES} or git log for info about what BitcoinJ tag to use
-# Use latest commit in 'prod' branch, which is a rebase on top of the latest tag
 Auto Update Mode:None
 Update Check Mode:RepoManifest/prod
-Current Version:3.22
-Current Version Code:143
+Current Version:3.30
+Current Version Code:151
 
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 059d393620..466f72c3eb 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
-Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
-Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
+Source Code:http://code.google.com/p/bitcoin-wallet/source
+Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues
 Bitcoin:1HkX6X8EakdsgAysL93oKrWiXGPbFiG1xV
 
 Summary:Testing version of Bitcoin
@@ -26,64 +26,129 @@ Repo:https://code.google.com/p/bitcoin-wallet/
 #Note: there used to be build data for 1.48.2/66 but the source code for this
 #seems to have gone (it was in a maintenance branch) when the project went
 #from svn to git.
-Build Version:2.01_test,74,a55ef6822c9e,subdir=wallet,maven=yes,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@31953d239555,\
-prebuild=\
-$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-$$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:2.02_test,75,d32701a4ce99,subdir=wallet,maven=yes,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@8ced139bf179,\
-prebuild=\
-cd $$BitcoinJWallet$$ && $$MVN3$$ install && cd - && \
-$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-$$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:2.16_test,87,49c3da045e57,subdir=wallet,maven=2,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@a160dc24f38c,extibs=android/android-support-v4.jar,\
-prebuild=\
-cd $$BitcoinJWallet$$ && $$MVN3$$ install && cd - && \
-cd ../integration-android && $$MVN3$$ install && cd ../wallet && \
-mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:3.01-test,121,v3.01,maven=yes,patch=pom.patch,\
-bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
-sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
-cp -r $$BitcoinJWallet$$/ . && rm -rf market/
-Build Version:3.04-test,124,v3.04,maven=yes,patch=pom.patch,\
-bindir=wallet/target,srclibs=BitcoinJWallet@7cb7bfc11c11,prebuild=\
-cp -r $$BitcoinJWallet$$/ . && rm -rf market/
+Build:2.01_test,74
+    commit=a55ef6822c9e
+    subdir=wallet
+    maven=yes
+    srclibs=BitcoinJWallet@31953d239555
+    prebuild=$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+        $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+    bindir=wallet/target
 
-Build Version:3.14-test,134,v3.14,\
-srclibs=BitcoinJWallet@v0.9,\
-prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
-         rm -rf market/,\
-build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml,\
-maven=yes,\
-bindir=wallet/target
+Build:2.02_test,75
+    commit=d32701a4ce99
+    subdir=wallet
+    maven=yes
+    srclibs=BitcoinJWallet@8ced139bf179
+    prebuild=cd $$BitcoinJWallet$$ && \
+        $$MVN3$$ install && \
+        cd - && \
+        $$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+        $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+    bindir=wallet/target
 
-Build Version:3.15-test,135,3dbf4ba44ff8,\
-srclibs=BitcoinJWallet-origin@777e6781d7,\
-prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet-origin$$/ . && \
-         rm -rf market/,\
-build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml,\
-maven=yes,\
-bindir=wallet/target
+Build:2.16_test,87
+    commit=49c3da045e57
+    subdir=wallet
+    maven=2
+    srclibs=BitcoinJWallet@a160dc24f38c
+    prebuild=cd $$BitcoinJWallet$$ && \
+        $$MVN3$$ install && \
+        cd - && \
+        cd ../integration-android && \
+        $$MVN3$$ install && \
+        cd ../wallet && \
+        mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
+        mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
+    bindir=wallet/target
+    extibs=android/android-support-v4.jar
 
-Build Version:3.18-test,139,v3.18,\
-srclibs=BitcoinJWallet@v0.10.1,\
-prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
-         rm -rf market/,\
-build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml,\
-maven=yes,\
-bindir=wallet/target
+Build:3.01-test,121
+    commit=v3.01
+    maven=yes
+    srclibs=BitcoinJWallet@1649520e3183
+    patch=pom.patch
+    prebuild=sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    bindir=wallet/target
+
+Build:3.04-test,124
+    commit=v3.04
+    maven=yes
+    srclibs=BitcoinJWallet@7cb7bfc11c11
+    patch=pom.patch
+    prebuild=cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    bindir=wallet/target
+
+Build:3.14-test,134
+    commit=v3.14
+    maven=yes
+    srclibs=BitcoinJWallet@v0.9
+    prebuild=sed -i '30,33d' pom.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+    bindir=wallet/target
+
+Build:3.15-test,135
+    commit=3dbf4ba44ff8
+    maven=yes
+    srclibs=BitcoinJWallet-origin@777e6781d7
+    prebuild=sed -i '30,33d' pom.xml && \
+        cp -r $$BitcoinJWallet-origin$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml
+    bindir=wallet/target
+
+Build:3.18-test,139
+    commit=v3.18
+    maven=yes
+    srclibs=BitcoinJWallet@v0.10.1
+    prebuild=sed -i '30,33d' pom.xml && \
+        cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf market/
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
+    bindir=wallet/target
+
+Build:3.23-test,144
+    commit=b75b225c7289
+    subdir=wallet
+    maven=yes@..
+    srclibs=BitcoinJWallet@v0.10.2
+    prebuild=cp -r $$BitcoinJWallet$$/ . && \
+        rm -rf ../market/ &&	sed -i '/sample-integration-android/d' ../pom.xml
+    build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml
+
+Build:3.27-test,148
+    commit=2654e2cbc6ac
+    subdir=wallet
+    maven=yes@..
+    rm=market/
+    srclibs=BitcoinJWallet-origin@v0.10.3
+    prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+
+Build:3.28-test,149
+    commit=2246feca3217
+    subdir=wallet
+    maven=yes@..
+    rm=market/
+    srclibs=BitcoinJWallet-origin@v0.10.3
+    prebuild=cp -r $$BitcoinJWallet-origin$$/ BitcoinJWallet
+    build=$$MVN3$$ clean install -f BitcoinJWallet/pom.xml
+
+Maintainer Notes:
+Do other wallet app first: can use tags here because security is less important.
+Don't forget the version name though!
+
+There is no 3.24-test, 3.24 fixed a release problem at the developer's end.
+
+.
 
-# Do other wallet app first: can use tags here because security is less important
-# Don't forget the version name though!
 Auto Update Mode:None
-# Just follow main wallet app
 Update Check Mode:Static
-Current Version:3.18-test
-Current Version Code:139
+Current Version:3.28-test
+Current Version Code:149
 
diff --git a/metadata/de.shandschuh.slightbackup.txt b/metadata/de.shandschuh.slightbackup.txt
index cfc53ecc85..5a42841ce5 100644
--- a/metadata/de.shandschuh.slightbackup.txt
+++ b/metadata/de.shandschuh.slightbackup.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:https://github.com/handschuh/Slight-backup
 Source Code:https://github.com/handschuh/Slight-backup
diff --git a/metadata/de.shandschuh.sparserss.txt b/metadata/de.shandschuh.sparserss.txt
index 5b5210319c..22614e5dba 100644
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@@ -1,7 +1,7 @@
-Category:Internet
+Categories:Internet
 License:MIT
 Web Site:http://code.google.com/p/sparserss/
-Source Code:http://code.google.com/p/sparserss/source/checkout
+Source Code:http://code.google.com/p/sparserss/source
 Issue Tracker:
 
 Auto Name:Sparse rss
diff --git a/metadata/de.skubware.opentraining.txt b/metadata/de.skubware.opentraining.txt
index 7e22197099..6661d53131 100644
--- a/metadata/de.skubware.opentraining.txt
+++ b/metadata/de.skubware.opentraining.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/chaosbastler/opentraining
 Source Code:https://github.com/chaosbastler/opentraining
@@ -9,37 +9,68 @@ Summary:Plan your fitness training
 Description:
 Create a fitness plan by targeting specific muscles and selecting from
 the list.
-When you've created a
-set you can export a spreadsheet to html for printing.
-Some of the exercise names are in German but
-that shouldn't affect the app usage.
+
+When you've created a set you can export a spreadsheet to html for printing.
+Some of the exercise names are in German but that shouldn't affect the app
+usage.
 .
 
 Repo Type:git
 Repo:https://github.com/chaosbastler/opentraining.git
 
-Build Version:0.2.2,5,v0.2.2,target=android-16,prebuild=\
-wget http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar -P libs/
-Build Version:0.2.3,6,v0.2.3,target=android-16,extlibs=junit/junit-4.10.jar
-Build Version:0.3.1,8,v0.3.1,subdir=app,\
-srclibs=ActionBarSherlock@90939dc,extlibs=junit/junit-4.10.jar,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:0.4,11,v0.4,subdir=app,\
-srclibs=ActionBarSherlock@90939dc,extlibs=junit/junit-4.10.jar,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:0.5,18,v0.5,target=android-18,subdir=app,\
-extlibs=junit/junit-4.10.jar,prebuild=\
-	cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
-	echo -e "\nandroid.library.reference.1=./appcompat/" >> ./local.properties && \
-	$$SDK$$/tools/android update lib-project --path ./appcompat/
-Build Version:0.5.1,19,v0.5.1,target=android-18,subdir=app,\
-extlibs=junit/junit-4.10.jar,prebuild=\
-	cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
-	echo -e "\nandroid.library.reference.1=./appcompat/" >> ./local.properties && \
-	$$SDK$$/tools/android update lib-project --path ./appcompat/
+Build:0.2.2,5
+    commit=v0.2.2
+    target=android-16
+    prebuild=wget http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar -P libs/
+
+Build:0.2.3,6
+    commit=v0.2.3
+    target=android-16
+    extlibs=junit/junit-4.10.jar
+
+Build:0.3.1,8
+    commit=v0.3.1
+    subdir=app
+    extlibs=junit/junit-4.10.jar
+    srclibs=ActionBarSherlock@90939dc
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:0.4,11
+    commit=v0.4
+    subdir=app
+    extlibs=junit/junit-4.10.jar
+    srclibs=ActionBarSherlock@90939dc
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:0.5,18
+    commit=v0.5
+    subdir=app
+    target=android-18
+    extlibs=junit/junit-4.10.jar
+    prebuild=cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
+        echo -e "\nandroid.library.reference.1=./appcompat/" >> ./local.properties && \
+        $$SDK$$/tools/android update lib-project --path ./appcompat/
+
+Build:0.5.1,19
+    commit=v0.5.1
+    subdir=app
+    target=android-18
+    extlibs=junit/junit-4.10.jar
+    prebuild=cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
+        echo -e "\nandroid.library.reference.1=./appcompat/" >> ./local.properties && \
+        $$SDK$$/tools/android update lib-project --path ./appcompat/
+
+Build:0.6,22
+    commit=v0.6
+    subdir=app
+    target=android-18
+    extlibs=junit/junit-4.10.jar
+    prebuild=cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
+        echo -e "\nandroid.library.reference.1=./appcompat/" >> ./local.properties && \
+        $$SDK$$/tools/android update lib-project --path ./appcompat/
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.5.1
-Current Version Code:19
+Current Version:0.6
+Current Version Code:22
 
diff --git a/metadata/de.srlabs.gsmmap.txt b/metadata/de.srlabs.gsmmap.txt
new file mode 100644
index 0000000000..4dcfe9f11f
--- /dev/null
+++ b/metadata/de.srlabs.gsmmap.txt
@@ -0,0 +1,33 @@
+Categories:Science & Education
+License:GPLv3
+Web Site:https://opensource.srlabs.de/projects/mobile-network-assessment-tools/wiki/GSMmap-apk
+Source Code:https://opensource.srlabs.de/projects/mobile-network-assessment-tools/repository/gsmmap-android
+Issue Tracker:
+
+Auto Name:GSMmap
+Summary:GSM Security Mapper
+Description:
+The GSM Security Map at gsmmap.org compares the protection capabilities of mobile networks. This app collects data and adds it to GSM Map.
+This application currently only works on Samsung S2 and S3 devices and requires root priviliges during the mobile network data capture.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://opensource.srlabs.de:/git/gsmmap-android.git
+
+Build:1.01,2
+    commit=5f681b56
+    subdir=gsmmap
+    prebuild=rm -rf src/test
+
+Build:1.05,10
+    commit=790a7b9a2
+    subdir=gsmmap
+    prebuild=rm -rf src/test
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.05
+Current Version Code:10
+
diff --git a/metadata/de.stefan_oltmann.falling_blocks.txt b/metadata/de.stefan_oltmann.falling_blocks.txt
index 9ea9ce5385..9794d8c617 100644
--- a/metadata/de.stefan_oltmann.falling_blocks.txt
+++ b/metadata/de.stefan_oltmann.falling_blocks.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/fallingblocks-android/
-Source Code:http://code.google.com/p/fallingblocks-android/source/checkout
-Issue Tracker:http://code.google.com/p/fallingblocks-android/issues/list
+Source Code:http://code.google.com/p/fallingblocks-android/source
+Issue Tracker:http://code.google.com/p/fallingblocks-android/issues
 
 Auto Name:Falling Blocks
 Summary:Tetris clone
diff --git a/metadata/de.stefan_oltmann.kaesekaestchen.txt b/metadata/de.stefan_oltmann.kaesekaestchen.txt
index 12b9b4158e..a0858e7714 100644
--- a/metadata/de.stefan_oltmann.kaesekaestchen.txt
+++ b/metadata/de.stefan_oltmann.kaesekaestchen.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/kaesekaestchen
-Source Code:http://code.google.com/p/kaesekaestchen/source/checkout
-Issue Tracker:http://code.google.com/p/kaesekaestchen/issues/list
+Source Code:http://code.google.com/p/kaesekaestchen/source
+Issue Tracker:http://code.google.com/p/kaesekaestchen/issues
 
 Name:Dots'n'Boxes
 Auto Name:Käsekästchen
@@ -16,13 +16,12 @@ playing against the computer. The computer is red; you are blue.
 .
 
 Repo Type:git-svn
-Repo:http://kaesekaestchen.googlecode.com/svn/trunk/
+Repo:http://kaesekaestchen.googlecode.com/svn/trunk/Kaesekaestchen
 
-Build Version:0.5,7,9,subdir=Kaesekaestchen
+Build Version:0.5,7,9
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5
 Current Version Code:7
 
diff --git a/metadata/de.syss.MifareClassicTool.txt b/metadata/de.syss.MifareClassicTool.txt
new file mode 100644
index 0000000000..17a2326806
--- /dev/null
+++ b/metadata/de.syss.MifareClassicTool.txt
@@ -0,0 +1,42 @@
+Categories:System
+License:GPLv3
+Web Site:http://publications.icaria.de/mct
+Source Code:https://github.com/ikarus23/MifareClassicTool
+Issue Tracker:https://github.com/ikarus23/MifareClassicTool/issues
+
+Auto Name:Mifare Classic Tool
+Summary:Analyse a type of NFC tag
+Description:
+This is a low-level tool for analysing Mifare Classic RFID tags. 
+It is not intended to provide an easy interface for writing URIs to tags
+but that kind of thing is possible. 
+
+The source code page or website for has full instructions. 
+It should work on most NFC-enabled devices but there are exceptions.
+
+[https://github.com/ikarus23/MifareClassicTool/raw/master/CHANGELOG.txt Changelog]
+.
+
+Repo Type:git
+Repo:https://github.com/ikarus23/MifareClassicTool.git
+
+Build:1.6.0,18
+    commit=v1.6.0
+    subdir=Mifare Classic Tool
+    rm=logo;tools
+
+Build:1.7.0,19
+    commit=v1.7.0
+    subdir=Mifare Classic Tool
+    rm=logo;tools
+
+Build:1.7.1,20
+    commit=v1.7.1
+    subdir=Mifare Classic Tool
+    rm=logo;tools
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.7.1
+Current Version Code:20
+
diff --git a/metadata/de.tui.itlogger.txt b/metadata/de.tui.itlogger.txt
index bec6a627c1..5a14160dd4 100644
--- a/metadata/de.tui.itlogger.txt
+++ b/metadata/de.tui.itlogger.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://sourceforge.net/projects/itlogger
 Source Code:http://sourceforge.net/p/itlogger/code
diff --git a/metadata/de.tum.in.tumcampus.txt b/metadata/de.tum.in.tumcampus.txt
index b915810970..f9ee9fa81c 100644
--- a/metadata/de.tum.in.tumcampus.txt
+++ b/metadata/de.tum.in.tumcampus.txt
@@ -1,10 +1,10 @@
-Category:Internet 
-License:GPLv3
+Categories:Internet 
+License:GPLv3 or New BSD
 Web Site:https://apps.wiki.tum.de/TUM+Campus+App 
-Source Code:https://github.com/thomasbley/tum-campus 
-Issue Tracker:https://github.com/thomasbley/tum-campus/issues
+Source Code:https://github.com/TCA-Team/TumCampusApp
+Issue Tracker:https://github.com/TCA-Team/TumCampusApp/issues
 
-Auto Name:TUMCampus
+Auto Name:TUM Campus App
 Summary:Information about TU München
 Description:
 The Technical University of Munich is one of the biggest in Germany.
@@ -19,18 +19,24 @@ This app displays:
 * Important links
 * RSS-feeds
 * Automatic muting of the phone during lectures
+* Access to TUMonline
 
-Status: Final release.
+Bugsense has been removed for F-droid distribution.
+Status: Active Development.
 .
 
 Repo Type:git
-Repo:https://github.com/thomasbley/tum-campus.git
+Repo:https://github.com/TCA-Team/TumCampusApp.git
 
-Build Version:0.94,20,b99b8e14b7853d92af9a6700c1c6563d9c9287f9,prebuild=rm -rf releases/* && find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \
-sed -i '30s/package:/Uri uri = Uri.parse("package:/g' src/de/tum/in/tumcampus/Settings.java
+Build:1.1.2,32
+    commit=956e42b30a092a28c1748f5152d6779ca4399100
+    subdir=TumCampusApp
+    patch=bugsense.patch
+    prebuild=find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \
+        sed -i '30s/package:/Uri uri = Uri.parse("package:/g' src/de/tum/in/tumcampusapp/tumonline/TUMOnlineConst.java &&rm libs/bugsense*
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.94
-Current Version Code:20
+Update Check Mode:RepoManifest
+Current Version:1.1.2
+Current Version Code:32
 
diff --git a/metadata/de.tum.in.tumcampus/bugsense.patch b/metadata/de.tum.in.tumcampus/bugsense.patch
new file mode 100644
index 0000000000..c917c30157
--- /dev/null
+++ b/metadata/de.tum.in.tumcampus/bugsense.patch
@@ -0,0 +1,33 @@
+--- a/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java	2013-11-23 12:45:50.093747730 +0100
++++ b/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java	2013-11-23 16:31:20.752918783 +0100
+@@ -6,7 +6,7 @@
+ import android.os.StrictMode;
+ import android.util.Log;
+ 
+-import com.bugsense.trace.BugSenseHandler;
++//import com.bugsense.trace.BugSenseHandler;
+ 
+ import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity;
+ 
+@@ -18,18 +18,18 @@
+  */
+ public class StartupActivity extends Activity {
+ 	public static final boolean DEMO_MODE = false;
+-	public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = true;
++	public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = false;
+ 
+ 	@Override
+ 	protected void onCreate(Bundle savedInstanceState) {
+ 		super.onCreate(savedInstanceState);
+ 
+-		// Init a Bug Report to https://www.bugsense.com
++		/** Init a Bug Report to https://www.bugsense.com
+ 		if (TRACK_ERRORS_WITH_BUG_SENSE) {
+ 			Log.d(this.getClass().getSimpleName(), "BugSense initialized");
+ 			BugSenseHandler.initAndStartSession(this, "19d18764");
+ 		}
+-
++**/
+ 		// Workaround for new API version. There was a security update which
+ 		// disallows applications to execute HTTP request in the GUI main
+ 		// thread.
diff --git a/metadata/de.ub0r.android.adBlock.txt b/metadata/de.ub0r.android.adBlock.txt
index f01ffe9743..c882368d6d 100644
--- a/metadata/de.ub0r.android.adBlock.txt
+++ b/metadata/de.ub0r.android.adBlock.txt
@@ -3,7 +3,7 @@ Category:System
 License:GPLv3+
 Web Site:http://code.google.com/p/andblock/
 Source Code:https://github.com/felixb/adBlock
-Issue Tracker:http://code.google.com/p/andblock/issues/list
+Issue Tracker:http://code.google.com/p/andblock/issues
 
 Auto Name:AdBlock
 Summary:Ad-blocking HTTP proxy
diff --git a/metadata/de.ub0r.android.callmeter.txt b/metadata/de.ub0r.android.callmeter.txt
index 9ee23aa606..8fe0271759 100644
--- a/metadata/de.ub0r.android.callmeter.txt
+++ b/metadata/de.ub0r.android.callmeter.txt
@@ -1,9 +1,11 @@
-Category:System
+AntiFeatures:UpstreamNonFree
+Categories:System
 License:GPLv3+
 Web Site:
-Source Code:
-Issue Tracker:https://code.google.com/p/callmeter/issues/list
+Source Code:https://github.com/felixb/callmeter
+Issue Tracker:https://code.google.com/p/callmeter/issues
 
+Auto Name:Call Meter 3G
 Summary:Call and data logs
 Description:
 This app sums up your call, text and data logs. Different billing modes and periods are taken into
@@ -13,41 +15,56 @@ See [http://www.4.ub0r.de/android/callmeter/rulesets this page] for rulesets. Ch
 are on the website wiki.
 
 The non-Free Google Admob in the source code was replaced with an open-source library that does nothing.
-
-Status: Source code repo has disappeared.
 .
 
-# Repo disappeared
-#Repo Type:git
-#Repo:https://github.com/felixb/callmeter.git
+Repo Type:git
+Repo:https://github.com/felixb/callmeter.git
 
-Build Version:3.6.2,7362000,CallMeter3G-3.6.2,srclibs=\
-ActionBarSherlock@4.1.0;ViewPagerIndicator@2.4.1;ub0rlib@75e4a553dd;MobAdMob@2d5736,prebuild=\
-rm libs/* && sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
-echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
-echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
-Build Version:3.8.1,7381000,CallMeter3G-3.8.1,extlibs=android/android-support-v4.jar,srclibs=\
-ActionBarSherlock@4.2.0;ViewPagerIndicator@2.4.1;ub0rlib@144a5da04c;MobAdMob@2d5736,prebuild=\
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/ && \
-rm libs/* && sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
-echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
-echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
-Build Version:3.8.4,7384000,CallMeter3G-3.8.4,extlibs=android/android-support-v4.jar,srclibs=\
-ActionBarSherlock@4.2.0;ViewPagerIndicator@2.4.1;ub0rlib@144a5da04c;MobAdMob@2d5736,prebuild=\
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/ && \
-rm libs/* && sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\.2=.*@.2=$$ViewPagerIndicator$$@' project.properties && \
-echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
-echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
+Build:3.6.2,7362000
+    commit=CallMeter3G-3.6.2
+    srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.4.1;ub0rlib@75e4a553dd;MobAdMob@2d5736
+    prebuild=rm libs/* && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
+        echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
+        echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
+
+Build:3.8.1,7381000
+    commit=CallMeter3G-3.8.1
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;ViewPagerIndicator@2.4.1;ub0rlib@144a5da04c;MobAdMob@2d5736
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/ && \
+        rm libs/* && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
+        echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
+        echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
+
+Build:3.8.4,7384000
+    commit=CallMeter3G-3.8.4
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;ViewPagerIndicator@2.4.1;ub0rlib@144a5da04c;MobAdMob@2d5736
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        mv libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/ && \
+        rm libs/* && \
+        sed -i 's@\.1=.*@.1=$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\.2=.*@.2=$$ViewPagerIndicator$$@' project.properties && \
+        echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
+        echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
+
+Build:3.10,7391002
+    commit=e82a9a6f514e94f7
+    subdir=CallMeter3G
+    gradle=yes
+    srclibs=MobAdMob@3bd7888479e493d
+    prebuild=rm -f libs/GoogleAdMob*
+    build=(cd $$MobAdMob$$ && \
+        ant release) && \
+        mv $$MobAdMob$$/bin/classes.jar libs/MobAdMob.jar
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:3.8.4
-Current Version Code:7384000
-
-No Source Since:3.9
+Update Check Mode:Tags
+Current Version:3.10
+Current Version Code:7391002
 
diff --git a/metadata/de.ub0r.android.clipboardbeam.txt b/metadata/de.ub0r.android.clipboardbeam.txt
index 776fdb6338..f3896ffe93 100644
--- a/metadata/de.ub0r.android.clipboardbeam.txt
+++ b/metadata/de.ub0r.android.clipboardbeam.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:
 Source Code:https://github.com/felixb/clipboard-beam
diff --git a/metadata/de.ub0r.android.otpdroid.txt b/metadata/de.ub0r.android.otpdroid.txt
index a8060ebef1..11566dd0a2 100644
--- a/metadata/de.ub0r.android.otpdroid.txt
+++ b/metadata/de.ub0r.android.otpdroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Beer License
 Web Site:https://github.com/felixb/otpdroid/
 Source Code:https://github.com/felixb/otpdroid
diff --git a/metadata/de.ub0r.android.smsdroid.txt b/metadata/de.ub0r.android.smsdroid.txt
index 30a3d537fd..aaec7d3f59 100644
--- a/metadata/de.ub0r.android.smsdroid.txt
+++ b/metadata/de.ub0r.android.smsdroid.txt
@@ -1,8 +1,9 @@
-Category:Phone & SMS
+AntiFeatures:UpstreamNonFree
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/websmsdroid
 Source Code:https://github.com/felixb/smsdroid
-Issue Tracker:https://code.google.com/p/websmsdroid/issues/list
+Issue Tracker:https://code.google.com/p/websmsdroid/issues
 
 Auto Name:SMSdroid
 Summary:SMS app
diff --git a/metadata/de.ub0r.android.websms.connector.gmx.txt b/metadata/de.ub0r.android.websms.connector.gmx.txt
index 345a5058ea..4af72fed1b 100644
--- a/metadata/de.ub0r.android.websms.connector.gmx.txt
+++ b/metadata/de.ub0r.android.websms.connector.gmx.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/websmsdroid
 Source Code:https://github.com/felixb/websms-connector-gmx
-Issue Tracker:https://code.google.com/p/websmsdroid/issues/list
+Issue Tracker:https://code.google.com/p/websmsdroid/issues
 
 Auto Name:WebSMS Connector: GMX
 Summary:Websms addon
diff --git a/metadata/de.ub0r.android.websms.connector.smspilotru.txt b/metadata/de.ub0r.android.websms.connector.smspilotru.txt
index 2fda607364..cd2f6a6230 100644
--- a/metadata/de.ub0r.android.websms.connector.smspilotru.txt
+++ b/metadata/de.ub0r.android.websms.connector.smspilotru.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/websmsdroid
 Source Code:https://github.com/felixb/websms-connector-smspilot-ru
diff --git a/metadata/de.ub0r.android.websms.txt b/metadata/de.ub0r.android.websms.txt
index 564c1d82c8..498ca2bd5d 100644
--- a/metadata/de.ub0r.android.websms.txt
+++ b/metadata/de.ub0r.android.websms.txt
@@ -1,8 +1,9 @@
-Category:Phone & SMS
+AntiFeatures:UpstreamNonFree
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/websmsdroid
-Source Code:https://github.com/felixb/websms
-Issue Tracker:https://code.google.com/p/websmsdroid
+Source Code:https://github.com/felixb/websms/source
+Issue Tracker:https://code.google.com/p/websmsdroid/issues
 
 Auto Name:WebSMS
 Summary:Send texts via the WWW
diff --git a/metadata/de.uni_potsdam.hpi.openmensa.txt b/metadata/de.uni_potsdam.hpi.openmensa.txt
index 97f410d68b..969c4bb447 100644
--- a/metadata/de.uni_potsdam.hpi.openmensa.txt
+++ b/metadata/de.uni_potsdam.hpi.openmensa.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeNet
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/domoritz/open-mensa-android
 Source Code:https://github.com/domoritz/open-mensa-android
@@ -22,20 +22,30 @@ Status: BETA.
 Repo Type:git
 Repo:https://github.com/domoritz/open-mensa-android.git
 
-Build Version:0.4,4,39179db03aed6ed61e51256247ec4b71bfefa6a2,extlibs=\
-android/android-support-v4.jar;osmdroid/osmdroid-android-3.0.8.jar;\
-sl4j/slf4j-android-1.6.1-RC1.jar,srclibs=ActionBarSherlock@4.2.0;Google-Gson@gson-2.2.2,\
-prebuild=mv $$Google-Gson$$/src/main/java/com src
-Build Version:0.6,6,309182553aa05e,extlibs=android/android-support-v4.jar;\
-osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar,\
-srclibs=ActionBarSherlock@4.3.1;Google-Gson@gson-2.2.4,\
-prebuild=echo "source.dir=src;$$Google-Gson$$/src" >> project.properties
-# Don't use tag 0.7, it doesn't use gradle yet
+Build:0.4,4
+    disable=Build fails
+    commit=39179db03aed6ed61e51256247ec4b71bfefa6a2
+    extlibs=android/android-support-v4.jar;osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar
+    srclibs=ActionBarSherlock@4.2.0;Google-Gson@gson-2.2.2
+    prebuild=mv $$Google-Gson$$/src/main/java/com src
+
+Build:0.6,6
+    commit=309182553aa05e
+    extlibs=android/android-support-v4.jar;osmdroid/osmdroid-android-3.0.8.jar;sl4j/slf4j-android-1.6.1-RC1.jar
+    srclibs=ActionBarSherlock@4.3.1;Google-Gson@gson-2.2.4
+    prebuild=echo "source.dir=src;$$Google-Gson$$/src" >> project.properties
+
 # This ref only adds gradle and removes unnecessary stuff
-Build Version:0.7,7,1ac1e4660556b782549c34e775a1304a495291e1,gradle=yes
+Build:0.7,7
+    commit=1ac1e4660556b782549c34e775a1304a495291e1
+    gradle=yes
+
+Build:0.8,8
+    commit=0.8
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.7
-Current Version Code:7
+Current Version:0.8
+Current Version Code:8
 
diff --git a/metadata/de.wikilab.android.friendica01.txt b/metadata/de.wikilab.android.friendica01.txt
index 80e46b1718..f8be02280a 100644
--- a/metadata/de.wikilab.android.friendica01.txt
+++ b/metadata/de.wikilab.android.friendica01.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:MPL2
 Web Site:http://andfrnd.wiki-lab.net
 Source Code:https://github.com/max-weller/friendica-for-android
diff --git a/metadata/de.yaacc.txt b/metadata/de.yaacc.txt
index ecb9e999e8..3564cfb16a 100644
--- a/metadata/de.yaacc.txt
+++ b/metadata/de.yaacc.txt
@@ -1,8 +1,9 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://www.yaacc.de
 Source Code:http://sourceforge.net/p/yaacc/code/ci/master/tree/
 Issue Tracker:http://sourceforge.net/p/yaacc/tickets/
+FlattrID:1959151
 
 Name:Yaacc
 Auto Name:YAACC
@@ -18,15 +19,37 @@ Features:
 * UPNP Client
 * UPNP Controller
 * Control multiple media receivers at once
+* Multiple Receivers at once
+* Shuffle play
+* Thumbnails for images
+
+New Features:
+* improved compatibility with other upnp devices 
+* autostart upnp server and renderer
+* display of upnp device icons 
+* minor fixes and improvements
 .
 
 Repo Type:git
 Repo:git://git.code.sf.net/p/yaacc/code
 
-Build Version:1.0,1,RELEASE-1.0,subdir=main,target=android-17
+Build:1.0,1
+    commit=RELEASE-1.0
+    subdir=main
+    target=android-17
+
+Build:1.1.2,4
+    commit=RELEASE-1.1.2
+    subdir=main
+    target=android-17
+
+Build:1.1.3.1,7
+    commit=RELEASE-1.1.3.1
+    subdir=main
+    target=android-17
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:1.0
-Current Version Code:1
+Current Version:1.1.3.1
+Current Version Code:7
 
diff --git a/metadata/de.zauberstuhl.sechat.txt b/metadata/de.zauberstuhl.sechat.txt
index 748d5eaec6..10fab0868e 100644
--- a/metadata/de.zauberstuhl.sechat.txt
+++ b/metadata/de.zauberstuhl.sechat.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://www.sechat.org/
 Source Code:http://git.sechat.org/?p=SecHat.git;a=summary
diff --git a/metadata/dentex.youtube.downloader.txt b/metadata/dentex.youtube.downloader.txt
index 0268ea3dcb..117894205e 100644
--- a/metadata/dentex.youtube.downloader.txt
+++ b/metadata/dentex.youtube.downloader.txt
@@ -1,5 +1,5 @@
 AntiFeatures:Tracking
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:
 Source Code:https://gitorious.org/yt_downloader/yt_downloader
diff --git a/metadata/dev.drsoran.moloko.txt b/metadata/dev.drsoran.moloko.txt
index 272d58dc86..c66de0b0bc 100644
--- a/metadata/dev.drsoran.moloko.txt
+++ b/metadata/dev.drsoran.moloko.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/moloko
-Source Code:http://code.google.com/p/moloko/source/list
-Issue Tracker:http://code.google.com/p/moloko/issues/list
+Source Code:http://code.google.com/p/moloko/source
+Issue Tracker:http://code.google.com/p/moloko/issues
 
 Auto Name:Moloko
 Summary:Todo list app
diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt
index eb44ab8191..8ab70acdf0 100644
--- a/metadata/dev.ukanth.ufirewall.txt
+++ b/metadata/dev.ukanth.ufirewall.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/ukanth/afwall/wiki
 Source Code:https://github.com/ukanth/afwall
@@ -26,136 +26,191 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/ukanth/afwall.git
 
-Build Version:1.2.0,120,1.2.0,\
-srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@83785f0;\
-iptables@android-4.2.2_r1,extlibs=android/android-support-v4.jar,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/ && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-mkdir -p bb/ && cp -r $$Busybox$$/* bb/ && cd bb/ && \
-wget https://raw.github.com/tias/android-busybox-ndk/\
-bd2bf4f384350a2bb2f81444012a882ddd48662a/android_ndk_defconfigPlus && \
-mv android_ndk_defconfigPlus .config && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" && \
-mv busybox ../res/raw/busybox_g1 && cd ../ && \
-git clone https://android.googlesource.com/platform/external/iptables && cd iptables && \
-wget https://hg.adblockplus.org/adblockplusandroid/raw-file/c3c62b79e758/iptables.patch -P ../ && \
-git apply ../iptables.patch && sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
-make fixextensions build && mv libs/armeabi/iptables ../res/raw/iptables_armv5
-Build Version:1.2.4,124,v1.2.4,srclibs=\
-ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;\
-BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1,\
-extlibs=android/android-support-v4.jar;afwall.patch,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
-cp -r $$iptables$$/* external/iptables/ && mv libs/afwall.patch . && \
-touch external/iptables/extensions/fixinit.py && \
-git apply afwall.patch && cp -r $$Busybox$$/* external/busybox/ && \
-cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
-cd external/busybox && for i in configs/patches/*.patch; do patch -p1 < $i; done && \
-mv configs/android_ndk_stericson-like .config,build=\
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-cd external/busybox/ && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-mv busybox ../../res/raw/busybox_g1 && cd ../iptables && python extensions/fixinit.py && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../../res/raw/iptables_armv5
-Build Version:1.2.4.1,125,v1.2.4.1,srclibs=\
-ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;\
-BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1,\
-extlibs=android/android-support-v4.jar;afwall.patch,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
-cp -r $$iptables$$/* external/iptables/ && mv libs/afwall.patch . && \
-touch external/iptables/extensions/fixinit.py && \
-git apply afwall.patch && cp -r $$Busybox$$/* external/busybox/ && \
-cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
-cd external/busybox && for i in configs/patches/*.patch; do patch -p1 < $i; done && \
-mv configs/android_ndk_stericson-like .config,build=\
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-cd external/busybox/ && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-mv busybox ../../res/raw/busybox_g1 && cd ../iptables && python extensions/fixinit.py && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../../res/raw/iptables_armv5
-Build Version:1.2.5.2,129,v1.2.5.2,srclibs=\
-ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;\
-BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1,\
-extlibs=android/android-support-v4.jar;afwall.patch,prebuild=\
-rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
-mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
-cp -r $$iptables$$/* external/iptables/ && mv libs/afwall.patch . && \
-touch external/iptables/extensions/fixinit.py && \
-git apply afwall.patch && cp -r $$Busybox$$/* external/busybox/ && \
-cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
-cd external/busybox && for i in configs/patches/*.patch; do patch -p1 < $i; done && \
-mv configs/android_ndk_stericson-like .config,build=\
-export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-cd external/busybox/ && \
-make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-mv busybox ../../res/raw/busybox_g1 && cd ../iptables && python extensions/fixinit.py && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../../res/raw/iptables_armv5
-Build Version:1.2.6,132,v1.2.6,\
-srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;iptables@android-4.2.2_r1,\
-extlibs=android/android-support-v4.jar;afwall.patch,\
-prebuild=rm -rf external/iptables/* && cp -r $$iptables$$/* external/iptables/ && \
-         mv libs/afwall.patch . && \
-         tr -d '\r' < AndroidManifest.xml > output.file && mv output.file AndroidManifest.xml && \
-         touch external/iptables/extensions/fixinit.py && git apply afwall.patch && \
-         cd external/busybox/ && tar -jxf busybox-1.21.1.tar.bz2 && \
-         cd busybox-1.21.1/ && patch -p1 < ../022-ipv6.patch && \
-         cp ../defconfig .config && cd ../../../ && \
-         rm res/raw/busybox_g2 res/raw/iptables_armv5 res/raw/nflog \
-           external/busybox/busybox-1.21.1.tar.bz2 && \
-         mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-         sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(.2=\).*@\1$$LockPattern$$@' project.properties,\
-build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-      cd external/busybox/busybox-1.21.1/ && \
-      make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-      mv busybox ../../../res/raw/busybox_g2 && \
-      cd ../../iptables && python extensions/fixinit.py && cd ../../ && \
-      $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/iptables/Android.mk && \
-      mv libs/armeabi/iptables res/raw/iptables_armv5 && \
-      $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/nflog/Android.mk && \
-      mv libs/armeabi/nflog res/raw/
-Build Version:1.2.6.1,136,v1.2.6.1,\
-srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;iptables@android-4.2.2_r1,\
-extlibs=android/android-support-v4.jar;afwall.patch,\
-prebuild=rm -rf external/iptables/* && cp -r $$iptables$$/* external/iptables/ && \
-         mv libs/afwall.patch . && \
-         tr -d '\r' < AndroidManifest.xml > output.file && mv output.file AndroidManifest.xml && \
-         touch external/iptables/extensions/fixinit.py && git apply afwall.patch && \
-         cd external/busybox/ && tar -jxf busybox-1.21.1.tar.bz2 && \
-         cd busybox-1.21.1/ && patch -p1 < ../022-ipv6.patch && \
-         cp ../defconfig .config && cd ../../../ && \
-         rm res/raw/busybox_g2 res/raw/iptables_armv5 res/raw/nflog \
-           external/busybox/busybox-1.21.1.tar.bz2 && \
-         mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-         sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(.2=\).*@\1$$LockPattern$$@' project.properties,\
-build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-      cd external/busybox/busybox-1.21.1/ && \
-      make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-      mv busybox ../../../res/raw/busybox_g2 && \
-      cd ../../iptables && python extensions/fixinit.py && cd ../../ && \
-      $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/iptables/Android.mk && \
-      mv libs/armeabi/iptables res/raw/iptables_armv5 && \
-      $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/nflog/Android.mk && \
-      mv libs/armeabi/nflog res/raw/
+Build:1.2.0,120
+    commit=1.2.0
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@83785f0;iptables@android-4.2.2_r1
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/ && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
+        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        mkdir -p bb/ && \
+        cp -r $$Busybox$$/* bb/ && \
+        cd bb/ && \
+        wget https://raw.github.com/tias/android-busybox-ndk/bd2bf4f384350a2bb2f81444012a882ddd48662a/android_ndk_defconfigPlus && \
+        mv android_ndk_defconfigPlus .config && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" && \
+        mv busybox ../res/raw/busybox_g1 && \
+        cd ../ && \
+        git clone https://android.googlesource.com/platform/external/iptables && \
+        cd iptables && \
+        wget https://hg.adblockplus.org/adblockplusandroid/raw-file/c3c62b79e758/iptables.patch -P ../ && \
+        git apply ../iptables.patch && \
+        sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
+        make fixextensions build && \
+        mv libs/armeabi/iptables ../res/raw/iptables_armv5
 
-# iptables patch doesn't work with ndk-r9 (even with legacy toolchains)!
-Auto Update Mode:None
+Build:1.2.4,124
+    commit=v1.2.4
+    extlibs=android/android-support-v4.jar;afwall.patch
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
+        cp -r $$iptables$$/* external/iptables/ && \
+        mv libs/afwall.patch . && \
+        touch external/iptables/extensions/fixinit.py && \
+        git apply afwall.patch && \
+        cp -r $$Busybox$$/* external/busybox/ && \
+        cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
+        cd external/busybox && \
+        for i in configs/patches/*.patch; do patch -p1 < $i; done && \
+        mv configs/android_ndk_stericson-like .config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        cd external/busybox/ && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox ../../res/raw/busybox_g1 && \
+        cd ../iptables && \
+        python extensions/fixinit.py && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../../res/raw/iptables_armv5
+
+Build:1.2.4.1,125
+    commit=v1.2.4.1
+    extlibs=android/android-support-v4.jar;afwall.patch
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
+        cp -r $$iptables$$/* external/iptables/ && \
+        mv libs/afwall.patch . && \
+        touch external/iptables/extensions/fixinit.py && \
+        git apply afwall.patch && \
+        cp -r $$Busybox$$/* external/busybox/ && \
+        cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
+        cd external/busybox && \
+        for i in configs/patches/*.patch; do patch -p1 < $i; done && \
+        mv configs/android_ndk_stericson-like .config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        cd external/busybox/ && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox ../../res/raw/busybox_g1 && \
+        cd ../iptables && \
+        python extensions/fixinit.py && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../../res/raw/iptables_armv5
+
+Build:1.2.5.2,129
+    commit=v1.2.5.2
+    extlibs=android/android-support-v4.jar;afwall.patch
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@1_21_0;BusyboxConfigs@e71bc43bd0;iptables@android-4.2.2_r1
+    prebuild=rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/busybox/* external/iptables/* && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \
+        cp -r $$iptables$$/* external/iptables/ && \
+        mv libs/afwall.patch . && \
+        touch external/iptables/extensions/fixinit.py && \
+        git apply afwall.patch && \
+        cp -r $$Busybox$$/* external/busybox/ && \
+        cp -r $$BusyboxConfigs$$/* external/busybox/configs/ && \
+        cd external/busybox && \
+        for i in configs/patches/*.patch; do patch -p1 < $i; done && \
+        mv configs/android_ndk_stericson-like .config
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        cd external/busybox/ && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox ../../res/raw/busybox_g1 && \
+        cd ../iptables && \
+        python extensions/fixinit.py && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../../res/raw/iptables_armv5
+
+Build:1.2.6,132
+    commit=v1.2.6
+    extlibs=android/android-support-v4.jar;afwall.patch
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;iptables@android-4.2.2_r1
+    prebuild=rm -rf external/iptables/* && \
+        cp -r $$iptables$$/* external/iptables/ && \
+        mv libs/afwall.patch . && \
+        tr -d '\r' < AndroidManifest.xml > output.file && \
+        mv output.file AndroidManifest.xml && \
+        touch external/iptables/extensions/fixinit.py && \
+        git apply afwall.patch && \
+        cd external/busybox/ && \
+        tar -jxf busybox-1.21.1.tar.bz2 && \
+        cd busybox-1.21.1/ && \
+        patch -p1 < ../022-ipv6.patch && \
+        cp ../defconfig .config && \
+        cd ../../../ && \
+        rm res/raw/busybox_g2 res/raw/iptables_armv5 res/raw/nflog            external/busybox/busybox-1.21.1.tar.bz2 && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$LockPattern$$@' project.properties
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        cd external/busybox/busybox-1.21.1/ && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox ../../../res/raw/busybox_g2 && \
+        cd ../../iptables && \
+        python extensions/fixinit.py && \
+        cd ../../ && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/iptables/Android.mk && \
+        mv libs/armeabi/iptables res/raw/iptables_armv5 && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/nflog/Android.mk && \
+        mv libs/armeabi/nflog res/raw/
+
+Build:1.2.6.1,136
+    commit=v1.2.6.1
+    extlibs=android/android-support-v4.jar;afwall.patch
+    srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;iptables@android-4.2.2_r1
+    prebuild=rm -rf external/iptables/* && \
+        cp -r $$iptables$$/* external/iptables/ && \
+        mv libs/afwall.patch . && \
+        tr -d '\r' < AndroidManifest.xml > output.file && \
+        mv output.file AndroidManifest.xml && \
+        touch external/iptables/extensions/fixinit.py && \
+        git apply afwall.patch && \
+        cd external/busybox/ && \
+        tar -jxf busybox-1.21.1.tar.bz2 && \
+        cd busybox-1.21.1/ && \
+        patch -p1 < ../022-ipv6.patch && \
+        cp ../defconfig .config && \
+        cd ../../../ && \
+        rm res/raw/busybox_g2 res/raw/iptables_armv5 res/raw/nflog            external/busybox/busybox-1.21.1.tar.bz2 && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$LockPattern$$@' project.properties
+    build=export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        cd external/busybox/busybox-1.21.1/ && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox ../../../res/raw/busybox_g2 && \
+        cd ../../iptables && \
+        python extensions/fixinit.py && \
+        cd ../../ && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/iptables/Android.mk && \
+        mv libs/armeabi/iptables res/raw/iptables_armv5 && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=external/nflog/Android.mk && \
+        mv libs/armeabi/nflog res/raw/
+
+Build:1.2.7,141
+    commit=v1.2.7
+    submodules=yes
+    prebuild=rm -f res/raw/{iptables,ip6tables,busybox,nflog}*
+    build=make -C external NDK=$$NDK$$
+    buildjni=no
+
+Build:1.2.8,146
+    commit=v1.2.8
+    submodules=yes
+    prebuild=rm -f res/raw/{iptables,ip6tables,busybox,nflog}*
+    build=make -C external NDK=$$NDK$$
+    buildjni=no
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.2.6.2
-Current Version Code:137
+Current Version:1.2.8
+Current Version Code:146
 
diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt
index 57e0ec4d59..d15db73e04 100644
--- a/metadata/dk.andsen.asqlitemanager.txt
+++ b/metadata/dk.andsen.asqlitemanager.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:EUPL
 Web Site:http://aaa.andsen.dk/aSQLiteManager.html
 Source Code:http://sourceforge.net/p/asqlitemanager/code
diff --git a/metadata/dk.jens.backup.txt b/metadata/dk.jens.backup.txt
index dcacd92dbe..8d00190d99 100644
--- a/metadata/dk.jens.backup.txt
+++ b/metadata/dk.jens.backup.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:
 Source Code:https://github.com/jensstein/oandbackup
@@ -29,15 +29,44 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/jensstein/oandbackup.git
 
-Build Version:0.1.13.1,4,0.1.13.1,target=android-17
-Build Version:0.1.14,5,0.1.14,target=android-17
-Build Version:0.2.0,6,0.2.0,target=android-17
-Build Version:0.2.1,7,0.2.1,target=android-17
-Build Version:0.2.3,9,0.2.3,target=android-17
-Build Version:0.2.4,10,0.2.4,target=android-17
+Build:0.1.13.1,4
+    commit=0.1.13.1
+    target=android-17
+
+Build:0.1.14,5
+    commit=0.1.14
+    target=android-17
+
+Build:0.2.0,6
+    commit=0.2.0
+    target=android-17
+
+Build:0.2.1,7
+    commit=0.2.1
+    target=android-17
+
+Build:0.2.3,9
+    commit=0.2.3
+    target=android-17
+
+Build:0.2.4,10
+    commit=0.2.4
+    target=android-17
+
+Build:0.2.5,11
+    commit=0.2.5
+    target=android-17
+
+Build:0.2.6,12
+    commit=0.2.6
+    target=android-17
+
+Build:0.2.7,13
+    commit=0.2.7
+    target=android-17
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.2.4
-Current Version Code:10
+Current Version:0.2.7
+Current Version Code:13
 
diff --git a/metadata/dk.mide.fas.cmnightlies.txt b/metadata/dk.mide.fas.cmnightlies.txt
index a45f8ad6a0..0f57ec1532 100644
--- a/metadata/dk.mide.fas.cmnightlies.txt
+++ b/metadata/dk.mide.fas.cmnightlies.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:http://fas.mide.dk
 Source Code:https://github.com/fasmide/app-cm-nightlies
diff --git a/metadata/dk.nindroid.rss.txt b/metadata/dk.nindroid.rss.txt
index 2049cb9930..287a3dbb07 100644
--- a/metadata/dk.nindroid.rss.txt
+++ b/metadata/dk.nindroid.rss.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:https://code.google.com/p/floatingimage
-Source Code:https://code.google.com/p/floatingimage/source/list
-Issue Tracker:https://code.google.com/p/floatingimage/issues/list
+Source Code:https://code.google.com/p/floatingimage/source
+Issue Tracker:https://code.google.com/p/floatingimage/issues
 Donate:https://code.google.com/p/floatingimage
 
 Auto Name:Floating Image
diff --git a/metadata/edu.killerud.kitchentimer.txt b/metadata/edu.killerud.kitchentimer.txt
index a5654dde55..4dfe2b6552 100644
--- a/metadata/edu.killerud.kitchentimer.txt
+++ b/metadata/edu.killerud.kitchentimer.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/wkillerud/hiofenigma-android
 Source Code:https://github.com/wkillerud/hiofenigma-android
@@ -17,9 +17,20 @@ sound an alarm, and vibrate until you turn the alarm off.
 Repo Type:git
 Repo:https://github.com/wkillerud/hiofenigma-android.git
 
-Build Version:2.0,3,93c4b6c3cbf8674f7bdc32c74866225ab000fae2,subdir=opentimer,target=android-14
-Build Version:2.1,4,e91cea59a0ec1ca63a0,subdir=opentimer,target=android-14
-Build Version:2.2,5,!Missing source - see https://github.com/wkillerud/hiofenigma-android/issues/1 (at c69d67356cf05e9),subdir=opentimer,target=android-14
+Build:2.0,3
+    commit=93c4b6c3cbf8674f7bdc32c74866225ab000fae2
+    subdir=opentimer
+    target=android-14
+
+Build:2.1,4
+    commit=e91cea59a0ec1ca63a0
+    subdir=opentimer
+    target=android-14
+
+Build:2.2,5
+    commit=188e357
+    subdir=opentimer
+    target=android-14
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/edu.nyu.cs.omnidroid.app.txt b/metadata/edu.nyu.cs.omnidroid.app.txt
index 6b8db4f4ce..594fbf6684 100644
--- a/metadata/edu.nyu.cs.omnidroid.app.txt
+++ b/metadata/edu.nyu.cs.omnidroid.app.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/omnidroid/
-Source Code:http://code.google.com/p/omnidroid/source/checkout
-Issue Tracker:http://code.google.com/p/omnidroid/issues/list
+Source Code:http://code.google.com/p/omnidroid/source
+Issue Tracker:http://code.google.com/p/omnidroid/issues
 
 Auto Name:Omnidroid
 Summary:Automated Event Handler
@@ -14,13 +14,16 @@ trigger any other applications actions. An intuitive user interface allows
 the user to control what events cause what actions to occur.
 .
 
-Repo Type:svn
-Repo:http://omnidroid.googlecode.com/svn/trunk/
+Repo Type:git-svn
+Repo:http://omnidroid.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:0.2.1,6,861,subdir=omnidroid,fixtrans=yes
+Build:0.2.1,6
+    commit=release-0.2.1
+    subdir=omnidroid
+    fixtrans=yes
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:0.2.1
 Current Version Code:6
 
diff --git a/metadata/edu.rit.poe.atomix.txt b/metadata/edu.rit.poe.atomix.txt
index 90e7d8bf22..2179e425e6 100644
--- a/metadata/edu.rit.poe.atomix.txt
+++ b/metadata/edu.rit.poe.atomix.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://code.google.com/p/droid-atomix/
-Source Code:http://code.google.com/p/droid-atomix/source/checkout
-Issue Tracker:http://code.google.com/p/droid-atomix/issues/list
+Source Code:http://code.google.com/p/droid-atomix/source
+Issue Tracker:http://code.google.com/p/droid-atomix/issues
 
 Auto Name:DroidAtomix
 Summary:Puzzle game
@@ -18,8 +18,7 @@ Repo:https://droid-atomix.googlecode.com/hg/
 Build Version:1.0.1,2,ea2086d1f9fe759866008f6fe5187fc1cc97bd1d,target=android-4,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.1
 Current Version Code:2
 
diff --git a/metadata/edu.sfsu.cs.orange.ocr.txt b/metadata/edu.sfsu.cs.orange.ocr.txt
index f2258a59ce..afbd113ae6 100644
--- a/metadata/edu.sfsu.cs.orange.ocr.txt
+++ b/metadata/edu.sfsu.cs.orange.ocr.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/rmtheis/android-ocr
@@ -13,7 +13,7 @@ It is possible to long-press the result to copy it, so that it can be pasted
 into a browser or a dictionary.
 
 Experimental app for optical character recognition (OCR).
-Runs the Tesseract 3.02 OCR engine on your device to find text in images
+Runs the Tesseract OCR engine on your device to find text in images
 captured by the device camera, without uploading your images to a server.
 It is suitable for recognizing individual words or short phrases of text.
 
@@ -21,26 +21,7 @@ The default single-shot capture runs OCR on a snapshot image that's captured
 when you click the shutter button, like a regular photo.
 When the "continuous preview" checkbox is checked, the app shows a dynamic,
 real-time display of what the device is recognizing right beside the camera
-viewfinder. The continuous preview mode works best on a fast device. The
-app supports x86 natively.
-
-# Point the device at some text and touch the on-screen shutter button to start OCR
-# To copy text to the clipboard or share text, long-press on the text after pressing the shutter button
-# For recognizing individual Chinese/Japanese/Korean characters, access the settings and set the page segmentation mode to "single character"
-
-RECOGNITION ACCURACY
-* Various factors can cause the OCR to fail: uneven illumination, stylized text, or text without enough contrast from the background. Try to have good lighting
-* Hold the device steady, and be sure the picture is in focus
-* If you need to scan a large block of text or an entire document, consider using a flatbed document scanner
-
-Supported languages for OCR: Arabic, Bulgarian, Catalan, Chinese (Simplified),
-Chinese (Traditional), Czech, Danish, Dutch, English, Finnish, French, German,
-Greek, Hindi, Hungarian, Indonesian, Italian, Japanese, Korean, Latvian,
-Lithuanian, Polish, Portuguese, Romanian, Russian, Serbian (Latin), Slovak,
-Slovenian, Spanish, Swedish, Tagalog, Thai, Turkish, Ukrainian, and Vietnamese.
-Arabic OCR requires a large amount of RAM. If your device doesn't have enough
-RAM, the app will quit during OCR. The preferred language can be chosen in
-the settings.
+viewfinder. The continuous preview mode works best on a fast device.
 .
 
 Repo Type:git
@@ -51,10 +32,22 @@ subdir=android,srclibs=TessTwo@cbfa61eff0,prebuild=\
 sed -i 's@\(rence.1=\).*@\1../tess-two@' project.properties && \
 cp -r $$TessTwo$$ ../,build=$$NDK$$/ndk-build -C ../tess-two
 
-Auto Update Mode:None
-# not every version is published and there is no secondary check
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.5.12
-Current Version Code:31
+Build:0.5.13,32
+    disable=needs testing
+    commit=10c6621452be6f215
+    subdir=android
+    srclibs=1:TessTwo@8f63ae2058159
+    build=$$NDK$$/ndk-build -C $$TessTwo$$
+
+Build:0.5.14,33
+    disable=next release
+
+Maintainer Notes:
+RepoManifest always a version ahead, since upstream bumps versions just after each release.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.5.14
+Current Version Code:33
 
diff --git a/metadata/ee.smkv.calc.loan.txt b/metadata/ee.smkv.calc.loan.txt
index 44e5790504..9e24c572fb 100644
--- a/metadata/ee.smkv.calc.loan.txt
+++ b/metadata/ee.smkv.calc.loan.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/android-simple-loan-calculator/
-Source Code:http://code.google.com/p/android-simple-loan-calculator/source/list
-Issue Tracker:http://code.google.com/p/android-simple-loan-calculator/issues/list
+Source Code:http://code.google.com/p/android-simple-loan-calculator/source
+Issue Tracker:http://code.google.com/p/android-simple-loan-calculator/issues
 Donate:http://samkov.pri.ee/simple-loan-calculator/
 
 Auto Name:Simple Loan Calculator
diff --git a/metadata/es.cesar.quitesleep.txt b/metadata/es.cesar.quitesleep.txt
index ff88b901bb..04e9b9fecf 100644
--- a/metadata/es.cesar.quitesleep.txt
+++ b/metadata/es.cesar.quitesleep.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://code.google.com/p/quitesleep/
-Source Code:http://code.google.com/p/quitesleep/source/checkout
-Issue Tracker:http://code.google.com/p/quitesleep/issues/list
+Source Code:http://code.google.com/p/quitesleep/source
+Issue Tracker:http://code.google.com/p/quitesleep/issues
 
 Auto Name:QuiteSleep
 Summary:Answer calls when you're busy
diff --git a/metadata/es.prodevelop.gvsig.mini.txt b/metadata/es.prodevelop.gvsig.mini.txt
index 5b45843903..8840215267 100644
--- a/metadata/es.prodevelop.gvsig.mini.txt
+++ b/metadata/es.prodevelop.gvsig.mini.txt
@@ -1,5 +1,5 @@
 Disabled:Await further development: can't figure out where the jars come from
-Category:Navigation
+Categories:Navigation
 License:GPLv2
 Web Site:https://confluence.prodevelop.es/display/GVMN/Home
 Source Code:https://svn.prodevelop.es/public/gvsigmini/
@@ -11,13 +11,14 @@ Description:
 A tile-based map viewer with support for maps from many sources.
 .
 
-Repo Type:svn
-Repo:https://svn.prodevelop.es/public/gvsigmini/gvsig_mini_android/trunk/
+Repo Type:git-svn
+Repo:https://svn.prodevelop.es/public/gvsigmini/gvsig_mini_android/trunk
 
-Build Version:1.2.0,443,1332
+Build:1.2.0,443
+    commit=1332
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.2.2
-Current Version Code:456
+Update Check Mode:RepoManifest
+Current Version:1.2.0
+Current Version Code:443
 
diff --git a/metadata/eu.domob.anacam.txt b/metadata/eu.domob.anacam.txt
index 10d317553b..c3e6006102 100644
--- a/metadata/eu.domob.anacam.txt
+++ b/metadata/eu.domob.anacam.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://www.domob.eu/projects/anacam.php
 Source Code:http://sourceforge.net/p/anacam/code/
diff --git a/metadata/eu.domob.angulo.txt b/metadata/eu.domob.angulo.txt
index 7c5f8a4bb4..7cd10ba914 100644
--- a/metadata/eu.domob.angulo.txt
+++ b/metadata/eu.domob.angulo.txt
@@ -1,7 +1,7 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://www.domob.eu/projects/angulo.php
-Source Code:http://sourceforge.net/scm/?type=svn&group_id=600412
+Source Code:http://sourceforge.net/p/angulo/code
 Issue Tracker:http://sourceforge.net/tracker/?group_id=600412
 Donate:http://www.domob.eu/donate.php
 Bitcoin:1domobKsPZ5cWk2kXssD8p8ES1qffGUCm
@@ -11,20 +11,19 @@ Summary:Angle Measuring
 Description:
 Angulo allows to measure angles by pointing the device, using the internal
 acceleration (gravity) and magnetic sensors. The interface is very simple
-and easy-to-use.
+and easy-to-use.  It can also be used as a water-level and to measure
+inclines of streets or hills.
 .
 
 Repo Type:git-svn
-Repo:https://angulo.svn.sourceforge.net/svnroot/angulo/trunk
+Repo:https://svn.code.sf.net/p/angulo/code/trunk/
 
-#Wrong revision for this one? The resulting APK is labelled as 1.1
-#Build Version:1.0,10000,25,update=force
 Build Version:1.1,10100,29,update=force
 Build Version:1.2,10200,36,update=force
+Build Version:1.3,10300,46,update=force
 
 Auto Update Mode:None
-# Author will let us know
 Update Check Mode:Static
-Current Version:1.2
-Current Version Code:10200
+Current Version:1.3
+Current Version Code:10300
 
diff --git a/metadata/eu.domob.bjtrainer.txt b/metadata/eu.domob.bjtrainer.txt
index bde2d7ac9d..9aabf81f62 100644
--- a/metadata/eu.domob.bjtrainer.txt
+++ b/metadata/eu.domob.bjtrainer.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://www.domob.eu/projects/bjtrainer.php
 Source Code:https://sourceforge.net/p/bjtrainer/code/
diff --git a/metadata/eu.e43.impeller.txt b/metadata/eu.e43.impeller.txt
index 975a846819..2edaa67078 100644
--- a/metadata/eu.e43.impeller.txt
+++ b/metadata/eu.e43.impeller.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://impeller.e43.eu
 Source Code:https://github.com/oshepherd/Impeller
@@ -20,38 +20,153 @@ following people or viewing their profiles.
 Repo Type:git
 Repo:https://github.com/oshepherd/Impeller.git
 
-Build Version:0.1,2,24cfa5
-Build Version:0.2,3,v0.2
-Build Version:0.2.1,4,v0.2.1
-Build Version:0.3.0,6,v0.3.0
-Build Version:0.3.1,7,v0.3.1
-Build Version:0.3.2,8,v0.3.2
-Build Version:0.3.3,9,v0.3.3
-Build Version:0.3.4,10,v0.3.4
-Build Version:0.4,11,v0.4
-Build Version:0.4.1,12,v0.4.1
-Build Version:0.4.3,15,v0.4.3
-Build Version:0.4.4,16,v0.4.4,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.4.5,17,v0.4.5,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.4.6,4006,v0.4.6,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.4.7,4007,v0.4.7,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.5.1,5001,v0.5.1,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.5.2,5002,v0.5.2,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.5.3,5003,v0.5.3,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.5.5,5005,v0.5.5,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.6.0,6000,v0.6.0,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.6.1,6001,v0.6.1,\
-init=rm jiraconnect-android-main/build.xml,\
-update=.;jiraconnect-android-main,\
-target=android-18,\
-extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar,\
-prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
-         mkdir -p jiraconnect-android-main/libs && cd jiraconnect-android-main/libs/ && \
-         wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
-Build Version:0.6.2,6002,v0.6.2,target=android-18,update=.;jiraconnect-android-main,extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar,init=rm jiraconnect-android-main/build.xml,prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties &&          mkdir -p jiraconnect-android-main/libs && cd jiraconnect-android-main/libs/ &&          wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
+Build:0.1,2
+    commit=24cfa5
+
+Build:0.2,3
+    commit=v0.2
+
+Build:0.2.1,4
+    commit=v0.2.1
+
+Build:0.3.0,6
+    commit=v0.3.0
+
+Build:0.3.1,7
+    commit=v0.3.1
+
+Build:0.3.2,8
+    commit=v0.3.2
+
+Build:0.3.3,9
+    commit=v0.3.3
+
+Build:0.3.4,10
+    commit=v0.3.4
+
+Build:0.4,11
+    commit=v0.4
+
+Build:0.4.1,12
+    commit=v0.4.1
+
+Build:0.4.3,15
+    commit=v0.4.3
+
+Build:0.4.4,16
+    commit=v0.4.4
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.4.5,17
+    commit=v0.4.5
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.4.6,4006
+    commit=v0.4.6
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.4.7,4007
+    commit=v0.4.7
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.5.1,5001
+    commit=v0.5.1
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.5.2,5002
+    commit=v0.5.2
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.5.3,5003
+    commit=v0.5.3
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.5.5,5005
+    commit=v0.5.5
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.6.0,6000
+    commit=v0.6.0
+    init=rm jiraconnect-android-main/build.xml
+    update=.;jiraconnect-android-main
+
+Build:0.6.1,6001
+    commit=v0.6.1
+    init=rm jiraconnect-android-main/build.xml
+    target=android-18
+    update=.;jiraconnect-android-main
+    extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
+        mkdir -p jiraconnect-android-main/libs && \
+        cd jiraconnect-android-main/libs/ && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
+
+Build:0.6.2,6002
+    commit=v0.6.2
+    init=rm jiraconnect-android-main/build.xml
+    target=android-18
+    update=.;jiraconnect-android-main
+    extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
+        mkdir -p jiraconnect-android-main/libs && \
+        cd jiraconnect-android-main/libs/ && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
+
+Build:0.7.0,7000
+    commit=v0.7.0
+    init=rm jiraconnect-android-main/build.xml
+    target=android-18
+    extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar
+    prebuild=printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
+        mkdir -p jiraconnect-android-main/libs && \
+        cd jiraconnect-android-main/libs/ && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && \
+        wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
+
+Build:0.8.2,8002
+    commit=v0.8.2
+    gradle=yes
+
+Build:0.8.3,8003
+    commit=v0.8.3
+    gradle=yes
+
+Build:0.8.5,8005
+    commit=v0.8.5
+    gradle=yes
+
+Maintainer Notes:
+Although in auto mode, builds for 0.8.0 and 0.8.1 were skipped because source
+code was not pushed to the upstream repo.
+.
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.6.2
-Current Version Code:6002
+Current Version:0.8.5
+Current Version Code:8005
 
diff --git a/metadata/eu.flatworld.android.slider.txt b/metadata/eu.flatworld.android.slider.txt
index b035b656fa..a9107b5dfc 100644
--- a/metadata/eu.flatworld.android.slider.txt
+++ b/metadata/eu.flatworld.android.slider.txt
@@ -1,8 +1,9 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:Apache2
 Web Site:http://www.flatworld.eu/slider
-Source Code:http://code.google.com/p/android-slider/source/list
-Issue Tracker:http://code.google.com/p/android-slider/issues/list
+Source Code:http://code.google.com/p/android-slider/source
+Issue Tracker:http://code.google.com/p/android-slider/issues
 
 Summary:Basic musical instrument
 Description:
diff --git a/metadata/eu.hydrologis.geopaparazzi.txt b/metadata/eu.hydrologis.geopaparazzi.txt
index 7651d1917c..1de5b18c3a 100644
--- a/metadata/eu.hydrologis.geopaparazzi.txt
+++ b/metadata/eu.hydrologis.geopaparazzi.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/geopaparazzi/
-Source Code:http://code.google.com/p/geopaparazzi/source/list
-Issue Tracker:http://code.google.com/p/geopaparazzi/issues/list
+Source Code:http://code.google.com/p/geopaparazzi/source
+Issue Tracker:http://code.google.com/p/geopaparazzi/issues
 Donate:http://code.google.com/p/geopaparazzi/
 
 Auto Name:GeoPaparazzi
diff --git a/metadata/eu.inmite.android.gridwichterle.txt b/metadata/eu.inmite.android.gridwichterle.txt
new file mode 100644
index 0000000000..4a20d1e2d4
--- /dev/null
+++ b/metadata/eu.inmite.android.gridwichterle.txt
@@ -0,0 +1,26 @@
+Categories:Development
+License:Apache2
+Web Site:
+Source Code:https://github.com/inmite/android-grid-wichterle
+Issue Tracker:https://github.com/inmite/android-grid-wichterle/issues
+
+Auto Name:GridWichterle
+Summary:Grid overlay
+Description:
+Makes adherence to [http://developer.android.com/design/style/metrics-grids.html design]
+guidlines much easier.
+.
+
+Repo Type:git
+Repo:https://github.com/inmite/android-grid-wichterle.git
+
+Build:1.0.2,10002
+    commit=17023
+    disable=strange missing classes crash on startup
+    maven=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.2
+Current Version Code:10002
+
diff --git a/metadata/eu.johncasson.meerkatchallenge.txt b/metadata/eu.johncasson.meerkatchallenge.txt
new file mode 100644
index 0000000000..4ca415036b
--- /dev/null
+++ b/metadata/eu.johncasson.meerkatchallenge.txt
@@ -0,0 +1,23 @@
+Categories:Games
+License:MIT
+Web Site:
+Source Code:https://github.com/jcasson/MeerkatChallenge
+Issue Tracker:https://github.com/jcasson/MeerkatChallenge/issues
+
+Auto Name:Meerkat Challenge
+Summary:Whack-a-mole game
+Description:
+Whack the meerkats as they pop out of the ground.
+.
+
+Repo Type:git
+Repo:https://github.com/jcasson/MeerkatChallenge.git
+
+Build:1.0,1
+    commit=v1.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/eu.lavarde.pmtd.txt b/metadata/eu.lavarde.pmtd.txt
index debfbca98e..5cea4ed360 100644
--- a/metadata/eu.lavarde.pmtd.txt
+++ b/metadata/eu.lavarde.pmtd.txt
@@ -1,8 +1,8 @@
-Category:Science & Education;Children
+Categories:Science & Education,Children
 License:GPLv3+
 Web Site:http://eric.lavar.de/comp/android/pmtd/
-Source Code:http://code.google.com/p/pmtd/source/
-Issue Tracker:http://code.google.com/p/pmtd/issues/
+Source Code:http://code.google.com/p/pmtd/source
+Issue Tracker:http://code.google.com/p/pmtd/issues
 
 Auto Name:PlusMinusTimesDivide
 Summary:Train children in arithmetic
@@ -12,7 +12,7 @@ methods: addition, subtraction, multiplication and division.
 The preferences allow to adapt the app's difficulty to any pupil's level,
 from basic primary (elementary) school to secondary and beyond.
 
-The program gives hints when the given answer is wrong (send me your tips if
+The program gives hints when the given answer is wrong (send upstream your tips if
 you have some more). The preferences dialog (from the Menu button) allows
 adaptation to most levels of difficulty required by children in different ages:
 maximum of operands or result, integer or decimal (with up to four decimal
diff --git a/metadata/eu.lighthouselabs.obd.reader.txt b/metadata/eu.lighthouselabs.obd.reader.txt
index f3796ac12d..e8d946699f 100644
--- a/metadata/eu.lighthouselabs.obd.reader.txt
+++ b/metadata/eu.lighthouselabs.obd.reader.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
-Web Site:http://code.google.com/p/android-obd-reader
-Source Code:http://code.google.com/p/android-obd-reader/source/list
-Issue Tracker:http://code.google.com/p/android-obd-reader/issues/list
+Web Site:https://github.com/pires/android-obd-reader
+Source Code:https://github.com/pires/android-obd-reader
+Issue Tracker:https://github.com/pires/android-obd-reader/issues
 
 Auto Name:OBD II Reader
 Summary:Car diagnostics
@@ -13,7 +13,7 @@ Status: Testing.
 .
 
 Repo Type:git
-Repo:https://code.google.com/p/android-obd-reader
+Repo:https://github.com/pires/android-obd-reader.git
 
 Build Version:1.3,10,c039790d9,subdir=obd-reader,prebuild=\
 sed -i 's/android:enabled="false"//g' res/xml/preferences.xml && \
diff --git a/metadata/eu.prismsw.lampshade.txt b/metadata/eu.prismsw.lampshade.txt
index cc53a79897..1bb948eb3b 100644
--- a/metadata/eu.prismsw.lampshade.txt
+++ b/metadata/eu.prismsw.lampshade.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:MIT
 Web Site:https://github.com/prismsw/Lampshade
 Source Code:https://github.com/prismsw/Lampshade
diff --git a/metadata/eu.siebeck.sipswitch.txt b/metadata/eu.siebeck.sipswitch.txt
index 75053911e2..04d9ed9222 100644
--- a/metadata/eu.siebeck.sipswitch.txt
+++ b/metadata/eu.siebeck.sipswitch.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://github.com/robert7k/sipswitch
 Source Code:https://github.com/robert7k/sipswitch
diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt
index d113bf3ae3..5bcb86f255 100644
--- a/metadata/eu.vranckaert.worktime.txt
+++ b/metadata/eu.vranckaert.worktime.txt
@@ -1,7 +1,8 @@
-Category:Office
+AntiFeatures:UpstreamNonFree
+Categories:Office
 License:Apache2
 Web Site:https://code.google.com/p/worktime
-Source Code:https://code.google.com/p/worktime/source/list
+Source Code:https://code.google.com/p/worktime/source
 Issue Tracker:https://code.google.com/p/worktime/wiki/Issues?tm=3
 
 Auto Name:WorkTime
@@ -37,7 +38,6 @@ rm libs/google-analytics*
 
 Auto Update Mode:None
 # releases have their own branch
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.1.15
 Current Version Code:270
diff --git a/metadata/faenza.adw.theme.txt b/metadata/faenza.adw.theme.txt
index 87843b5637..eaa94b9575 100644
--- a/metadata/faenza.adw.theme.txt
+++ b/metadata/faenza.adw.theme.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/faenza-adw-theme/
-Source Code:https://code.google.com/p/faenza-adw-theme/source/list
+Source Code:https://code.google.com/p/faenza-adw-theme/source
 Issue Tracker:
 
 Auto Name:Faenza ADW Theme
diff --git a/metadata/fi.harism.wallpaper.flier.txt b/metadata/fi.harism.wallpaper.flier.txt
index f40ee61d2f..0ceb6509e3 100644
--- a/metadata/fi.harism.wallpaper.flier.txt
+++ b/metadata/fi.harism.wallpaper.flier.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/harism/android_wallpaper_flier
diff --git a/metadata/fi.harism.wallpaper.flowers.txt b/metadata/fi.harism.wallpaper.flowers.txt
index 1f0eb454bf..57c3e7869c 100644
--- a/metadata/fi.harism.wallpaper.flowers.txt
+++ b/metadata/fi.harism.wallpaper.flowers.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/harism/android_wallpaper_flowers
 Source Code:https://github.com/harism/android_wallpaper_flowers
@@ -16,8 +16,7 @@ Repo:https://github.com/harism/android_wallpaper_flowers.git
 Build Version:3.2,10,51d7f9a56
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:3.2
 Current Version Code:10
 
diff --git a/metadata/fi.harism.wallpaper.yinyang.txt b/metadata/fi.harism.wallpaper.yinyang.txt
index cae8ea6af4..820f69fdaf 100644
--- a/metadata/fi.harism.wallpaper.yinyang.txt
+++ b/metadata/fi.harism.wallpaper.yinyang.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:https://github.com/harism/android_wallpaper_yinyang
 Source Code:https://github.com/harism/android_wallpaper_yinyang
diff --git a/metadata/fi.mikuz.boarder.txt b/metadata/fi.mikuz.boarder.txt
index 795af14a55..1cc07c29f2 100644
--- a/metadata/fi.mikuz.boarder.txt
+++ b/metadata/fi.mikuz.boarder.txt
@@ -1,4 +1,5 @@
-Category:Multimedia
+Disabled:Proprietary binaries (bugsense)
+Categories:Multimedia
 License:Apache2
 Web Site:
 Source Code:https://github.com/Mikuz/Boarder
@@ -19,16 +20,32 @@ is not good. Minor known bugs included.
 Repo Type:git
 Repo:https://github.com/Mikuz/Boarder.git
 
-Build Version:0.13,7,ebd8e563b6dc79512c16fa996a2
-Build Version:0.20,8,v0.20
-Build Version:0.21,9,v0.21
-Build Version:0.23,11,v0.23
-Build Version:0.30,12,v0.30
-Build Version:0.31,13,v0.31
-Build Version:0.32,14,v0.32
+Build:0.13,7
+    commit=ebd8e563b6dc79512c16fa996a2
+
+Build:0.20,8
+    commit=v0.20
+
+Build:0.21,9
+    commit=v0.21
+
+Build:0.23,11
+    commit=v0.23
+
+Build:0.30,12
+    commit=v0.30
+
+Build:0.31,13
+    commit=v0.31
+
+Build:0.32,14
+    commit=v0.32
+
+Build:0.33,15
+    commit=v0.33
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.32
-Current Version Code:14
+Current Version:0.33
+Current Version Code:15
 
diff --git a/metadata/fi.testbed2.txt b/metadata/fi.testbed2.txt
new file mode 100644
index 0000000000..7a838f9b47
--- /dev/null
+++ b/metadata/fi.testbed2.txt
@@ -0,0 +1,37 @@
+AntiFeatures:UpstreamNonFree
+Categories:Science & Education
+License:GPLv3
+Web Site:
+Source Code:https://github.com/mvestola/helsinki-testbed2-android
+Issue Tracker:https://github.com/mvestola/helsinki-testbed2-android/issues
+
+Auto Name:Helsinki Testbed Viewer 2.0
+Summary:Weather maps
+Description:
+With the application, you can, for example, view the real-time rain radar or 
+current wind speed and direction. The maps cover the Southern Finland.
+
+The data is copyright the 
+[http://testbed.fmi.fi Helsinki Testbed Project] and the app has nothing to 
+do with that project: it's only a client.
+
+A proprietary ad library was removed.
+.
+
+Repo Type:git
+Repo:https://github.com/mvestola/helsinki-testbed2-android.git
+
+Build:2.0.12,20
+    commit=2.0.12
+    maven=yes
+    rm=src/test
+    srclibs=MobAdMob@2d5736
+    prebuild=sed -i '53,59d;155,174d' pom.xml && \
+        sed -i 's/3.4.0/3.6.1/g;s/\${android.target.api.version}/17/g' pom.xml && \
+        cp -r $$MobAdMob$$/src/com/* src/main/java/com/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.0.12
+Current Version Code:20
+
diff --git a/metadata/fm.libre.droid.txt b/metadata/fm.libre.droid.txt
index e794f0e16a..213e8f9a87 100644
--- a/metadata/fm.libre.droid.txt
+++ b/metadata/fm.libre.droid.txt
@@ -1,7 +1,7 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3+
 Web Site:http://libre.fm
-Source Code:http://gitorious.org/foocorp/gnu-fm/trees/master/clients/libredroid
+Source Code:http://gitorious.org/foocorp/gnu-fm
 Issue Tracker:
 
 Auto Name:Libre Droid
@@ -13,11 +13,10 @@ A streaming radio player client for Libre.fm.
 Repo Type:git
 Repo:git://gitorious.org/foocorp/gnu-fm.git
 
-Build Version:1.4,4,926fde6d208190a1fffef12a47bb231f908125e8,subdir=clients/libredroid
 Build Version:1.2,3,4ebfcf224745ca443a308463721e4f8001293f15,subdir=clients/libredroid
+Build Version:1.4,4,926fde6d208190a1fffef12a47bb231f908125e8,subdir=clients/libredroid
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:1.4
 Current Version Code:4
diff --git a/metadata/fr.bellev.stdatmosphere.txt b/metadata/fr.bellev.stdatmosphere.txt
index 94a5fbadaf..16eddd839b 100644
--- a/metadata/fr.bellev.stdatmosphere.txt
+++ b/metadata/fr.bellev.stdatmosphere.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/mathbellev/StdAtmosphere
 Source Code:https://github.com/mathbellev/StdAtmosphere
diff --git a/metadata/fr.gaulupeau.apps.Poche.txt b/metadata/fr.gaulupeau.apps.Poche.txt
index 38fcd4dea8..e54e21bca3 100644
--- a/metadata/fr.gaulupeau.apps.Poche.txt
+++ b/metadata/fr.gaulupeau.apps.Poche.txt
@@ -1,4 +1,4 @@
-Category:None
+Categories:Internet
 License:GPLv3
 Web Site:http://www.inthepoche.com/
 Source Code:https://bitbucket.org/jogaulupeau/poche/src
diff --git a/metadata/fr.keuse.rightsalert.txt b/metadata/fr.keuse.rightsalert.txt
index 2acf3ce49c..6faccb4fd5 100644
--- a/metadata/fr.keuse.rightsalert.txt
+++ b/metadata/fr.keuse.rightsalert.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/cglapa/rights-alert
 Source Code:https://github.com/cglapa/rights-alert
diff --git a/metadata/fr.miximum.napply.txt b/metadata/fr.miximum.napply.txt
index a052f90c0f..5e8068899c 100644
--- a/metadata/fr.miximum.napply.txt
+++ b/metadata/fr.miximum.napply.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/thibault/Napply/
 Source Code:https://github.com/thibault/Napply
@@ -22,8 +22,7 @@ $$SDK$$/tools/android update project -p $$NumberPicker$$ && \
 sed -i 's@\(android.library.reference.1=\).*@\1$$NumberPicker$$@' project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2
 Current Version Code:2
 
diff --git a/metadata/fr.ornidroid.txt b/metadata/fr.ornidroid.txt
index 9590b36223..3a54c1d231 100644
--- a/metadata/fr.ornidroid.txt
+++ b/metadata/fr.ornidroid.txt
@@ -1,4 +1,5 @@
-Category:Science & Education
+Disabled:Non-free license
+Categories:Science & Education
 License:CCBYNC
 Web Site:https://github.com/giletvin/ornidroid/wiki
 Source Code:https://github.com/giletvin/ornidroid
diff --git a/metadata/fr.seeks.txt b/metadata/fr.seeks.txt
index 1fe0dae686..035c1de553 100644
--- a/metadata/fr.seeks.txt
+++ b/metadata/fr.seeks.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://www.seeks-project.info/site/
 Source Code:https://github.com/sileht/SeeksWidget
@@ -16,8 +16,7 @@ Repo:https://github.com/sileht/SeeksWidget.git
 Build Version:1.2,4,1.2
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.2
 Current Version Code:4
 
diff --git a/metadata/fr.simon.marquis.preferencesmanager.txt b/metadata/fr.simon.marquis.preferencesmanager.txt
new file mode 100644
index 0000000000..78a8ab3091
--- /dev/null
+++ b/metadata/fr.simon.marquis.preferencesmanager.txt
@@ -0,0 +1,40 @@
+Categories:System
+License:Apache2
+Web Site:
+Source Code:https://github.com/SimonMarquis/Android-PreferencesManager
+Issue Tracker:https://github.com/SimonMarquis/Android-PreferencesManager/issues
+
+Auto Name:Preferences Manager
+Summary:Edit app preferences
+Description:
+Applications store their preferences in databases and if you have root
+this app will allow you to edit those.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/SimonMarquis/Android-PreferencesManager.git
+
+Build:1.4,15
+    commit=b3d8533ace17
+    subdir=PreferencesManager
+    target=android-18
+    rm=PreferencesManager/assets;Resources;PreferencesManager/libs/rootfw.jar
+    srclibs=1:Support-v7@android-4.3_r2.1;2:RootFW@2_0.3.2;3:StickyListHeaders-tots@62be7e8a7e547
+    patch=fonts_15.patch
+    prebuild=mv libs/android-support-v4.jar $$Support-v7$$/libs/
+
+Build:1.5,16
+    commit=v1.5
+    disable=crashes: android.view.InflateException: Binary XML file line #49: Error inflating class fr.simon.marquis.preferencesmanager.roboto.RobotoTextView
+    subdir=PreferencesManager
+    rm=PreferencesManager/assets;Resources;PreferencesManager/libs/rootfw.jar
+    srclibs=1:Support-v7@android-4.3_r2.1;2:RootFW@2_0.3.2;3:StickyListHeaders-tots@62be7e8a7e547
+    prebuild=mv libs/android-support-v4.jar $$Support-v7$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.5
+Current Version Code:16
+
diff --git a/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch b/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch
new file mode 100644
index 0000000000..c279bb6f7b
--- /dev/null
+++ b/metadata/fr.simon.marquis.preferencesmanager/fonts_15.patch
@@ -0,0 +1,742 @@
+diff --git a/PreferencesManager/project.properties b/PreferencesManager/project.properties
+index 568922b..c0cbb95 100644
+--- a/PreferencesManager/project.properties
++++ b/PreferencesManager/project.properties
+@@ -11,7 +11,6 @@
+ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+ 
+ # Project target.
+-target=android-18
+-android.library.reference.1=..\\..\\..\\..\\..\\adt-bundle-windows\\sdk\\extras\\android\\support\\v7\\appcompat
+-android.library.reference.3=../../StickyListHeaders-master/library
+-android.library.reference.2=../../Roboto
++target=android-18
++android.library.reference.1=../../srclib/Support-v7/v7/appcompat
++android.library.reference.2=../../srclib/StickyListHeaders-tots/library
+diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
+index 94caed1..aa61951 100644
+--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
++++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
+@@ -16,11 +16,11 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
+index 72c8a71..8dc1965 100644
+--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
++++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
+@@ -16,11 +16,11 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+diff --git a/PreferencesManager/res/layout/activity_app_list.xml b/PreferencesManager/res/layout/activity_app_list.xml
+index 8be67bc..927c233 100644
+--- a/PreferencesManager/res/layout/activity_app_list.xml
++++ b/PreferencesManager/res/layout/activity_app_list.xml
+@@ -46,14 +46,14 @@
+             android:layout_height="wrap_content"
+             android:layout_marginBottom="10dp" />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+             android:text="@string/loading_apps"
+             android:textAppearance="?android:attr/textAppearanceMedium"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+     <LinearLayout
+@@ -71,14 +71,14 @@
+             android:layout_marginBottom="10dp"
+             android:src="@drawable/empty_view" />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+             android:text="@string/empty_apps"
+             android:textAppearance="?android:attr/textAppearanceLarge"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+-</RelativeLayout>
+\ No newline at end of file
++</RelativeLayout>
+diff --git a/PreferencesManager/res/layout/activity_file_editor.xml b/PreferencesManager/res/layout/activity_file_editor.xml
+index 80fd815..a6b4d13 100644
+--- a/PreferencesManager/res/layout/activity_file_editor.xml
++++ b/PreferencesManager/res/layout/activity_file_editor.xml
+@@ -19,7 +19,7 @@
+     android:layout_width="match_parent"
+     android:layout_height="match_parent" >
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/editText"
+         android:layout_width="wrap_content"
+         android:layout_height="match_parent"
+@@ -31,6 +31,6 @@
+         android:background="@null"
+         android:gravity="center_vertical"
+         android:inputType="textMultiLine|textNoSuggestions|none"
+-        app:typeface="robotoslab_regular" />
++        />
+ 
+-</RelativeLayout>
+\ No newline at end of file
++</RelativeLayout>
+diff --git a/PreferencesManager/res/layout/activity_preferences.xml b/PreferencesManager/res/layout/activity_preferences.xml
+index 6d47634..e433ac3 100644
+--- a/PreferencesManager/res/layout/activity_preferences.xml
++++ b/PreferencesManager/res/layout/activity_preferences.xml
+@@ -56,14 +56,14 @@
+             android:layout_marginBottom="10dp"
+             android:src="@drawable/empty_view" />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+             android:text="@string/empty_preference_application"
+             android:textAppearance="?android:attr/textAppearanceLarge"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+     <LinearLayout
+@@ -82,14 +82,14 @@
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content" />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:gravity="center"
+             android:text="@string/loading_preference_application"
+             android:textAppearance="?android:attr/textAppearanceLarge"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+-</RelativeLayout>
+\ No newline at end of file
++</RelativeLayout>
+diff --git a/PreferencesManager/res/layout/dialog_about.xml b/PreferencesManager/res/layout/dialog_about.xml
+index 7caf943..b0adb1b 100644
+--- a/PreferencesManager/res/layout/dialog_about.xml
++++ b/PreferencesManager/res/layout/dialog_about.xml
+@@ -21,7 +21,7 @@
+     android:orientation="vertical"
+     android:showDividers="middle" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/app_name_and_version"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+@@ -33,14 +33,14 @@
+         android:drawablePadding="8dp"
+         android:gravity="center_vertical"
+         android:textSize="24sp"
+-        app:typeface="robotoslab_bold" />
++        />
+ 
+     <ScrollView
+         android:layout_width="match_parent"
+         android:layout_height="0dp"
+         android:layout_weight="1" >
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:id="@+id/about_body"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+@@ -48,7 +48,7 @@
+             android:padding="16dp"
+             android:textIsSelectable="true"
+             android:textSize="16sp"
+-            app:typeface="robotoslab_regular" />
++            />
+     </ScrollView>
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
+index 02497be..a6e127b 100644
+--- a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
+@@ -16,11 +16,11 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
+index 3d863c9..11eeece 100644
+--- a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
+@@ -16,11 +16,11 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
+index 9a7a066..eb624b2 100644
+--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
+@@ -22,12 +22,12 @@
+         android:layout_height="wrap_content"
+         android:orientation="horizontal" >
+ 
+-        <com.roboto.RobotoButton
++        <Button
+             android:id="@+id/btnKO"
+             style="@style/PreferenceDialogBtn"
+             android:text="@string/dialog_cancel" />
+ 
+-        <com.roboto.RobotoButton
++        <Button
+             android:id="@+id/btnOK"
+             style="@style/PreferenceDialogBtn"
+             android:text="@string/dialog_add" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
+index 935b6fb..47a9bf7 100644
+--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
+@@ -22,17 +22,17 @@
+         android:layout_height="wrap_content"
+         android:orientation="horizontal" >
+ 
+-        <com.roboto.RobotoButton
++        <Button
+             android:id="@+id/btnKO"
+             style="@style/PreferenceDialogBtn"
+             android:text="@string/dialog_cancel" />
+ 
+-        <com.roboto.RobotoButton
++        <Button
+             android:id="@+id/btnSUPPR"
+             style="@style/PreferenceDialogBtn"
+             android:text="@string/dialog_suppr" />
+ 
+-        <com.roboto.RobotoButton
++        <Button
+             android:id="@+id/btnOK"
+             style="@style/PreferenceDialogBtn"
+             android:text="@string/dialog_update" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_float_add.xml b/PreferencesManager/res/layout/dialog_pref_float_add.xml
+index 617f512..4cd2a3f 100644
+--- a/PreferencesManager/res/layout/dialog_pref_float_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_float_add.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:inputType="numberSigned|numberDecimal" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_float_edit.xml b/PreferencesManager/res/layout/dialog_pref_float_edit.xml
+index f68eb16..cd5d651 100644
+--- a/PreferencesManager/res/layout/dialog_pref_float_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_float_edit.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:inputType="numberSigned|numberDecimal" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_integer_add.xml b/PreferencesManager/res/layout/dialog_pref_integer_add.xml
+index 290e342..84755b5 100644
+--- a/PreferencesManager/res/layout/dialog_pref_integer_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_integer_add.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:inputType="numberSigned" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
+index fad0607..af228d5 100644
+--- a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:inputType="numberSigned" />
+diff --git a/PreferencesManager/res/layout/dialog_pref_string_add.xml b/PreferencesManager/res/layout/dialog_pref_string_add.xml
+index 69e1a9f..ed60ad3 100644
+--- a/PreferencesManager/res/layout/dialog_pref_string_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_string_add.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:ems="10"
+diff --git a/PreferencesManager/res/layout/dialog_pref_string_edit.xml b/PreferencesManager/res/layout/dialog_pref_string_edit.xml
+index 3e59626..b35f4ea 100644
+--- a/PreferencesManager/res/layout/dialog_pref_string_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_string_edit.xml
+@@ -16,15 +16,15 @@
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/value"
+         style="@style/EditTextValue"
+         android:ems="10"
+diff --git a/PreferencesManager/res/layout/dialog_pref_stringset_add.xml b/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
+index 89bdac1..b3e0077 100644
+--- a/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
++++ b/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
+@@ -17,11 +17,11 @@
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+@@ -39,7 +39,7 @@
+         </LinearLayout>
+     </ScrollView>
+ 
+-    <com.roboto.RobotoButton
++    <Button
+         android:id="@+id/action_add_stringset_entry"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+@@ -47,8 +47,8 @@
+         android:paddingLeft="4dp"
+         android:paddingRight="4dp"
+         android:text="@string/action_add_stringset_entry"
+-        app:typeface="robotoslab_regular" />
++        />
+ 
+     <include layout="@layout/dialog_pref_btn_bar_add" />
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
+index e6a350f..7de1f17 100644
+--- a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
++++ b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
+@@ -17,11 +17,11 @@
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     style="@style/PreferenceDialogContainer" >
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/title"
+         style="@style/PreferenceDialogTitle" />
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:id="@+id/key"
+         style="@style/EditTextKey" />
+ 
+@@ -39,7 +39,7 @@
+         </LinearLayout>
+     </ScrollView>
+ 
+-    <com.roboto.RobotoButton
++    <Button
+         android:id="@+id/action_add_stringset_entry"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+@@ -47,8 +47,8 @@
+         android:paddingLeft="4dp"
+         android:paddingRight="4dp"
+         android:text="@string/action_add_stringset_entry"
+-        app:typeface="robotoslab_regular" />
++        />
+ 
+     <include layout="@layout/dialog_pref_btn_bar_edit" />
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/layout/fragment_preferences.xml b/PreferencesManager/res/layout/fragment_preferences.xml
+index dcad159..55ba48b 100644
+--- a/PreferencesManager/res/layout/fragment_preferences.xml
++++ b/PreferencesManager/res/layout/fragment_preferences.xml
+@@ -52,7 +52,7 @@
+             android:layout_marginBottom="10dp"
+             android:src="@drawable/empty_view" />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:id="@+id/emptyViewText"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+@@ -60,7 +60,7 @@
+             android:text="@string/empty_preference_file_valid"
+             android:textAppearance="?android:attr/textAppearanceLarge"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+     <ProgressBar
+@@ -69,4 +69,4 @@
+         android:layout_height="wrap_content"
+         android:layout_centerInParent="true" />
+ 
+-</RelativeLayout>
+\ No newline at end of file
++</RelativeLayout>
+diff --git a/PreferencesManager/res/layout/row_application.xml b/PreferencesManager/res/layout/row_application.xml
+index f22cc6d..a7ac2d3 100644
+--- a/PreferencesManager/res/layout/row_application.xml
++++ b/PreferencesManager/res/layout/row_application.xml
+@@ -25,7 +25,7 @@
+         android:layout_height="48dip"
+         android:padding="4dp" />
+ 
+-    <com.roboto.RobotoTextView
++    <TextView
+         android:id="@+id/item_text"
+         android:layout_width="0dip"
+         android:layout_height="wrap_content"
+@@ -35,6 +35,6 @@
+         android:lines="1"
+         android:paddingLeft="8dp"
+         android:textAppearance="?android:attr/textAppearanceMedium"
+-        app:typeface="robotoslab_regular" />
++        />
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/layout/row_header.xml b/PreferencesManager/res/layout/row_header.xml
+index 64a0c64..27769e0 100644
+--- a/PreferencesManager/res/layout/row_header.xml
++++ b/PreferencesManager/res/layout/row_header.xml
+@@ -13,7 +13,7 @@
+      See the License for the specific language governing permissions and
+      limitations under the License.
+ -->
+-<com.roboto.RobotoTextView xmlns:android="http://schemas.android.com/apk/res/android"
++<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     android:id="@+id/text_header"
+     android:layout_width="match_parent"
+@@ -22,4 +22,4 @@
+     android:textAppearance="?android:attr/textAppearanceMedium"
+     android:textColor="#33b5e5"
+     android:textStyle="bold"
+-    app:typeface="robotoslab_bold" />
+\ No newline at end of file
++    />
+diff --git a/PreferencesManager/res/layout/row_preference.xml b/PreferencesManager/res/layout/row_preference.xml
+index 60d0694..c5e34b5 100644
+--- a/PreferencesManager/res/layout/row_preference.xml
++++ b/PreferencesManager/res/layout/row_preference.xml
+@@ -27,7 +27,7 @@
+         android:background="@drawable/abc_list_selector_holo_light"
+         android:orientation="vertical" >
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:id="@+id/item_name"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+@@ -38,9 +38,9 @@
+             android:ellipsize="end"
+             android:lines="1"
+             android:textAppearance="?android:attr/textAppearanceMedium"
+-            app:typeface="robotoslab_regular" />
++            />
+ 
+-        <com.roboto.RobotoTextView
++        <TextView
+             android:id="@+id/item_value"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+@@ -52,7 +52,7 @@
+             android:lines="1"
+             android:textAppearance="?android:attr/textAppearanceMedium"
+             android:textColor="@android:color/tertiary_text_light"
+-            app:typeface="robotoslab_light" />
++            />
+     </LinearLayout>
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/layout/row_stringset.xml b/PreferencesManager/res/layout/row_stringset.xml
+index e89a4c6..45d07de 100644
+--- a/PreferencesManager/res/layout/row_stringset.xml
++++ b/PreferencesManager/res/layout/row_stringset.xml
+@@ -19,7 +19,7 @@
+     android:layout_height="wrap_content"
+     android:orientation="horizontal" >
+ 
+-    <com.roboto.RobotoEditText
++    <EditText
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_gravity="center_vertical"
+@@ -29,7 +29,7 @@
+         android:ems="10"
+         android:gravity="left"
+         android:inputType="textMultiLine"
+-        app:typeface="robotoslab_regular" />
++        />
+ 
+     <ImageButton
+         android:layout_width="wrap_content"
+@@ -40,4 +40,4 @@
+         android:scaleType="centerInside"
+         android:src="@drawable/abc_ic_clear_search_api_holo_light" />
+ 
+-</LinearLayout>
+\ No newline at end of file
++</LinearLayout>
+diff --git a/PreferencesManager/res/values/styles.xml b/PreferencesManager/res/values/styles.xml
+index 213092c..3a88864 100644
+--- a/PreferencesManager/res/values/styles.xml
++++ b/PreferencesManager/res/values/styles.xml
+@@ -45,7 +45,6 @@
+         <item name="android:layout_height">wrap_content</item>
+         <item name="android:layout_marginTop">10dp</item>
+         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+-        <item name="typeface">robotoslab_light</item>
+     </style>
+     
+     <style name="PreferenceDialogBtn">
+@@ -54,7 +53,6 @@
+         <item name="android:layout_margin">4dp</item>
+         <item name="android:layout_weight">1</item>
+         <item name="android:background">@drawable/btn</item>
+-        <item name="typeface">robotoslab_regular</item>
+     </style>
+ 
+     <style name="EditTextKey">
+@@ -69,7 +67,6 @@
+         <item name="android:gravity">center</item>
+         <item name="android:hint">@string/hint_key</item>
+         <item name="android:inputType">textNoSuggestions</item>
+-        <item name="typeface">robotoslab_regular</item>
+     </style>
+ 
+     <style name="EditTextValue">
+@@ -82,7 +79,6 @@
+         <item name="android:ems">10</item>
+         <item name="android:gravity">center</item>
+         <item name="android:hint">@string/hint_value</item>
+-        <item name="typeface">robotoslab_regular</item>
+     </style>
+ 
+-</resources>
+\ No newline at end of file
++</resources>
+diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
+index 8b9b255..2bc4960 100644
+--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
+@@ -79,7 +79,6 @@ public class AppListActivity extends ActionBarActivity implements OnQueryTextLis
+ 				}
+ 			}
+ 		});
+-		getActionBar().setTitle(Utils.applyCustomTypeFace(getString(R.string.app_name), this));
+ 		if (savedInstanceState == null || Utils.getPreviousApps() == null) {
+ 			startTask();
+ 		} else {
+diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
+index ccc8cf8..714b3cb 100644
+--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
+@@ -269,7 +269,6 @@ public class FileEditorActivity extends ActionBarActivity implements TextWatcher
+ 
+ 	private void updateTitle() {
+ 		Spanned str = Html.fromHtml((mHasContentChanged ? "<font color='#33b5e5'><b>&#9679;</b></font> " : "") + mName);
+-		getActionBar().setTitle(Utils.applyCustomTypeFace(str, this));
+ 	}
+ 
+ 	private void clearSpans(Spannable source) {
+diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
+index 09f75ea..b422f8a 100644
+--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
+@@ -78,8 +78,6 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment
+ 
+ 		packageName = b.getString("PACKAGE_NAME");
+ 
+-		getActionBar().setTitle(Utils.applyCustomTypeFace(b.getString("TITLE"), this));
+-		getActionBar().setSubtitle(Utils.applyCustomTypeFace(packageName, this));
+ 		Drawable drawable = Utils.findDrawable(packageName, this);
+ 		if (drawable != null) {
+ 			getSupportActionBar().setIcon(drawable);
+@@ -151,11 +149,7 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment
+ 		public int getCount() {
+ 			return files.size();
+ 		}
+-
+-		@Override
+-		public CharSequence getPageTitle(int position) {
+-			return Utils.applyCustomTypeFace(files.get(position).getName(), PreferencesActivity.this);
+-		}
++		
+ 	}
+ 
+ 	@Override
+diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
+index f37c917..a66e91a 100644
+--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
++++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
+@@ -47,7 +47,6 @@ import android.util.Log;
+ import android.view.View;
+ import android.view.inputmethod.InputMethodManager;
+ 
+-import com.roboto.RobotoTypefaceManager;
+ import com.spazedog.lib.rootfw.container.FileStat;
+ 
+ import fr.simon.marquis.preferencesmanager.model.AppEntry;
+@@ -218,13 +217,6 @@ public class Utils {
+ 		imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ 	}
+ 
+-	public static SpannableString applyCustomTypeFace(CharSequence src, Context ctx) {
+-		SpannableString span = new SpannableString(src);
+-
+-		span.setSpan(new CustomTypefaceSpan("", RobotoTypefaceManager.obtaintTypeface(ctx, RobotoTypefaceManager.ROBOTOSLAB_REGULAR)), 0,
+-				span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+-		return span;
+-	}
+ 
+ 	public static Drawable findDrawable(String packageName, Context ctx) {
+ 		if (TextUtils.isEmpty(packageName)) {
diff --git a/metadata/fr.simon.marquis.secretcodes.txt b/metadata/fr.simon.marquis.secretcodes.txt
new file mode 100644
index 0000000000..65cdbc06ee
--- /dev/null
+++ b/metadata/fr.simon.marquis.secretcodes.txt
@@ -0,0 +1,45 @@
+Categories:System
+License:Apache2
+Web Site:http://simonmarquis.github.io/Android-SecretCodes
+Source Code:https://github.com/SimonMarquis/Android-SecretCodes
+Issue Tracker:https://github.com/SimonMarquis/Android-SecretCodes/issues
+
+Auto Name:Secret Codes
+Summary:Secret code scanner
+Description:
+Secret Codes is an application that allows you to scan the secret codes
+available on your device through the dialer app.
+
+The application will scan through all available secret codes on your device.
+Then you will be able to executes these secret codes and discover hidden
+functionalities.
+
+In Android a secret code is defined by this pattern: *#*#code#*#*.
+
+There are multiple ways to execute a secret code; The simplest is to directly
+write the secret code through the dialer application of your device.
+.
+
+Repo Type:git
+Repo:https://github.com/SimonMarquis/Android-SecretCodes.git
+
+Build:1.2,6
+    commit=v1.2
+    subdir=SecretCodes
+    srclibs=1:appcompat@v7
+
+Build:1.3.1,8
+    commit=v1.3.1
+    subdir=SecretCodes
+    srclibs=1:appcompat@v7
+
+Build:1.3.2,9
+    commit=v1.3.2
+    subdir=SecretCodes
+    srclibs=1:appcompat@v7
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3.2
+Current Version Code:9
+
diff --git a/metadata/fr.strasweb.asso.txt b/metadata/fr.strasweb.asso.txt
new file mode 100644
index 0000000000..af57de9675
--- /dev/null
+++ b/metadata/fr.strasweb.asso.txt
@@ -0,0 +1,26 @@
+Categories:Navigation
+License:GPLv3
+Web Site:http://www.chacunsonasso.net
+Source Code:https://svn.strasweb.fr/strasweb/API%20Animafac/phonegap
+Issue Tracker:
+
+Auto Name:ChacunSonAsso
+Summary:For French students
+Description:
+This app allows students wishing to volunteer to find an association that suits them.
+It allows you to search for associations in the Animafac directory, 
+by theme, department and name.
+.
+
+Repo Type:git-svn
+Repo:https://svn.strasweb.fr/strasweb/API%20Animafac/phonegap
+
+Build:1.0.1,2
+    commit=171
+    prebuild=sed -i '37s/true/false/g' AndroidManifest.xml
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.1
+Current Version Code:2
+
diff --git a/metadata/fr.strasweb.browserquest.txt b/metadata/fr.strasweb.browserquest.txt
index c544106457..9644735b8b 100644
--- a/metadata/fr.strasweb.browserquest.txt
+++ b/metadata/fr.strasweb.browserquest.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:MPL2
 Web Site:http://browserquest.mozilla.org
 Source Code:https://svn.strasweb.fr/listing.php?repname=Pierre+Rudloff&path=%2Fbrowserquest%2F
diff --git a/metadata/fr.strasweb.campus.txt b/metadata/fr.strasweb.campus.txt
index 717e2bf653..84ea9def1f 100644
--- a/metadata/fr.strasweb.campus.txt
+++ b/metadata/fr.strasweb.campus.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://strasweb.fr/
 Source Code:https://svn.strasweb.fr/listing.php?repname=StrasWeb&path=%2Fopendata%2Fapp%2F
@@ -11,7 +11,7 @@ HTML5 app that helps students in Strasbourg (France) find the best way to get
 to their campus.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://svn.strasweb.fr/strasweb/opendata/app/
 
 Build Version:1.0.1,4,149,target=android-17
diff --git a/metadata/fr.xgouchet.texteditor.txt b/metadata/fr.xgouchet.texteditor.txt
index 41a2021984..61a7a6743d 100644
--- a/metadata/fr.xgouchet.texteditor.txt
+++ b/metadata/fr.xgouchet.texteditor.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:https://github.com/xgouchet/Ted
 Source Code:https://github.com/xgouchet/Ted
diff --git a/metadata/fr.ybo.transportsbordeaux.txt b/metadata/fr.ybo.transportsbordeaux.txt
index 07fda12722..917690f988 100644
--- a/metadata/fr.ybo.transportsbordeaux.txt
+++ b/metadata/fr.ybo.transportsbordeaux.txt
@@ -1,4 +1,5 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 # See COPYING.txt
 License:GPLv3
 Web Site:
diff --git a/metadata/fr.ybo.transportsrennes.txt b/metadata/fr.ybo.transportsrennes.txt
index dbae63ac5f..3c2320d4e8 100644
--- a/metadata/fr.ybo.transportsrennes.txt
+++ b/metadata/fr.ybo.transportsrennes.txt
@@ -1,4 +1,5 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 # See COPYING.txt
 License:GPLv3
 Web Site:
@@ -25,35 +26,90 @@ Features:
 
 Google Maps are disabled in these builds. You can see the location of a
 situation with a cartographic app such as [[com.robert.maps]] or
-[[net.osmand.plus]] though.
+[[net.osmand.plus]] though. Proprietary libraries have been removed.
 .
 
 Repo Type:srclib
 Repo:TransportsRennes
 
-Build Version:3.4.3,343,TR_noGoogleMap_3.4.3,subdir=TransportsRennes,\
-prebuild=rm ../TransportsBordeaux/libs/GoogleAdMob*.jar,update=.;../TransportsCommun
-Build Version:3.4.4,344,TR_noGoogleMap_3.4.4,prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && rm ../TransportsBordeaux/libs/GoogleAdMob*.jar,update=.;../TransportsCommun,subdir=TransportsRennes
-Build Version:3.4.5,345,TR_noGoogleMap_3.4.5,subdir=TransportsRennes,\
-update=.;../TransportsCommun,\
-prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
-         rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
-Build Version:3.4.7,347,TR_noGoogleMap_3.4.7,subdir=TransportsRennes,\
-update=.;../TransportsCommun,\
-prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
-         rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
-Build Version:3.4.8,348,TR_noGoogleMap_3.4.8,\
-subdir=TransportsRennes,gradle=yes,\
-prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
-         rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
-Build Version:3.4.9,349,TR_noGoogleMap_3.4.9,\
-subdir=TransportsRennes,gradle=yes,\
-prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
-         rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+Build:3.4.3,343
+    commit=TR_noGoogleMap_3.4.3
+    subdir=TransportsRennes
+    update=.;../TransportsCommun
+    prebuild=rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
 
+Build:3.4.4,344
+    commit=TR_noGoogleMap_3.4.4
+    subdir=TransportsRennes
+    update=.;../TransportsCommun
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.4.5,345
+    commit=TR_noGoogleMap_3.4.5
+    subdir=TransportsRennes
+    update=.;../TransportsCommun
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.4.7,347
+    commit=TR_noGoogleMap_3.4.7
+    subdir=TransportsRennes
+    update=.;../TransportsCommun
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.4.8,348
+    commit=TR_noGoogleMap_3.4.8
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.4.9,349
+    commit=TR_noGoogleMap_3.4.9
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.5.1,351
+    commit=TR_noGoogleMap_3.5.1
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.5.2,352
+    commit=TR_noGoogleMap_3.5.2
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.5.3,353
+    commit=TR_noGoogleMap_3.5.3
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.5.4,354
+    commit=TR_noGoogleMap_3.5.4
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
+
+Build:3.5.5,355
+    commit=TR_noGoogleMap_3.5.5
+    subdir=TransportsRennes
+    gradle=yes
+    prebuild=sed -i '8s/true/false/g' res/xml/preferences.xml && \
+        rm ../TransportsBordeaux/libs/GoogleAdMob*.jar
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest/noGoogleMap
-Current Version:3.4.9
-Current Version Code:349
+Current Version:3.5.5
+Current Version Code:355
 
diff --git a/metadata/free.yhc.netmbuddy.txt b/metadata/free.yhc.netmbuddy.txt
new file mode 100644
index 0000000000..4c4084fdf4
--- /dev/null
+++ b/metadata/free.yhc.netmbuddy.txt
@@ -0,0 +1,25 @@
+Category:Multimedia
+License:Apache2
+Web Site:http://yhcting.tistory.com
+Source Code:https://github.com/yhcting/netmbuddy
+Issue Tracker:https://github.com/yhcting/netmbuddy/issues
+
+Auto Name:NetMBuddy
+Summary:Music player for Youtube
+Description:
+This basically a Youtube viewer but it's presented like a regular
+music player, allowing you to manage queues and playlists easily and
+play and pause audio in the background.
+.
+
+Repo Type:git
+Repo:https://github.com/yhcting/netmbuddy.git
+
+Build Version:1.2.11-1,29,netmbuddy-v1.2.11-1
+
+# 1.2.12 on gplay
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.2.11-1
+Current Version Code:29
+
diff --git a/metadata/genius.mohammad.floating.stickies.txt b/metadata/genius.mohammad.floating.stickies.txt
index dca6e1e5b4..cc9f7a68a7 100644
--- a/metadata/genius.mohammad.floating.stickies.txt
+++ b/metadata/genius.mohammad.floating.stickies.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://forum.xda-developers.com/showthread.php?t=2127834
 Source Code:https://github.com/MohammadAdib/FloatingStickies
diff --git a/metadata/github.daneren2005.dsub.txt b/metadata/github.daneren2005.dsub.txt
index e9831240a2..035e797df8 100644
--- a/metadata/github.daneren2005.dsub.txt
+++ b/metadata/github.daneren2005.dsub.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:
 Source Code:https://github.com/daneren2005/Subsonic
@@ -36,35 +36,97 @@ a key must be obtained by making a donation. (A key isn't required to use the
 Repo Type:git
 Repo:https://github.com/daneren2005/Subsonic.git
 
-Build Version:3.8.1,39,3.8.1,subdir=subsonic-android,init=\
-git clone https://github.com/bauerca/drag-sort-listview dslv && cd dslv && \
-git checkout 0.6.1,srclibs=ActionBarSherlock@4.2.0,update=.;dslv/library,\
-prebuild=mv libs/android-support-v4.jar dslv/library/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1dslv/library@' project.properties && \
-cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android
-Build Version:3.8.2,40,3.8.2,subdir=subsonic-android,init=\
-git clone https://github.com/bauerca/drag-sort-listview dslv && cd dslv && \
-git checkout 0.6.1,srclibs=ActionBarSherlock@4.2.0,update=.;dslv/library,\
-prebuild=mv libs/android-support-v4.jar dslv/library/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(android.library.reference.2=\).*@\1dslv/library@' project.properties && \
-cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android
-Build Version:3.8.5,43,ca8b3539,subdir=subsonic-android,\
-srclibs=ActionBarSherlock@90939dc3;DragSort@d39db07a2,prebuild=\
-mv libs/*v4.jar $$DragSort$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
-cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android
-Build Version:4.0.5,54,4.0.5,subdir=subsonic-android,\
-srclibs=ActionBarSherlock@c0d437c;DragSort@d39db07,prebuild=\
-cp libs/*v4.jar $$DragSort$$/libs/ && mv libs/*v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
-cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android
+Build:3.8.1,39
+    commit=3.8.1
+    subdir=subsonic-android
+    init=git clone https://github.com/bauerca/drag-sort-listview dslv && \
+        cd dslv && \
+        git checkout 0.6.1
+    update=.;dslv/library
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=mv libs/android-support-v4.jar dslv/library/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1dslv/library@' project.properties && \
+        cd ../ && \
+        mv subsonic-android sa && \
+        rm -rf subsonic-* repo && \
+        mv sa subsonic-android
+
+Build:3.8.2,40
+    commit=3.8.2
+    subdir=subsonic-android
+    init=git clone https://github.com/bauerca/drag-sort-listview dslv && \
+        cd dslv && \
+        git checkout 0.6.1
+    update=.;dslv/library
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=mv libs/android-support-v4.jar dslv/library/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1dslv/library@' project.properties && \
+        cd ../ && \
+        mv subsonic-android sa && \
+        rm -rf subsonic-* repo && \
+        mv sa subsonic-android
+
+Build:3.8.5,43
+    commit=ca8b3539
+    subdir=subsonic-android
+    srclibs=ActionBarSherlock@90939dc3;DragSort@d39db07a2
+    prebuild=mv libs/*v4.jar $$DragSort$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
+        cd ../ && \
+        mv subsonic-android sa && \
+        rm -rf subsonic-* repo && \
+        mv sa subsonic-android
+
+Build:4.0.5,54
+    commit=4.0.5
+    subdir=subsonic-android
+    srclibs=ActionBarSherlock@c0d437c;DragSort@d39db07
+    prebuild=cp libs/*v4.jar $$DragSort$$/libs/ && \
+        mv libs/*v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
+        cd ../ && \
+        mv subsonic-android sa && \
+        rm -rf subsonic-* repo && \
+        mv sa subsonic-android
+
+Build:4.1.2,59
+    commit=4.1.2
+    subdir=subsonic-android
+    srclibs=ActionBarSherlock@c0d437c;DragSort@d39db07
+    prebuild=cp libs/*v4.jar $$DragSort$$/libs/ && \
+        mv libs/*v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
+        cd ../ && \
+        mv subsonic-android sa && \
+        rm -rf subsonic-* repo && \
+        mv sa subsonic-android
+
+Build:4.3.3,77
+    commit=4.3.3
+    submodules=yes
+    target=android-19
+    rm=libs/android-support-v7-appcompat.jar
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1
+    prebuild=cp libs/android-support-v4.jar DragSortListView/library/libs/android-support-v4.jar && \
+        mv libs/android-support-v4.jar $$Support$$/libs
+
+Build:4.3.5,80
+    commit=4.3.5
+    submodules=yes
+    rm=libs/android-support-v7-appcompat.jar
+    extlibs=android/android-support-v4.jar
+    srclibs=1:Support/v7/appcompat@android-4.4_r1.1
+    prebuild=cp libs/android-support-v4.jar DragSortListView/library/libs/android-support-v4.jar && \
+        mv libs/android-support-v4.jar $$Support$$/libs
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:4.1.2
-Current Version Code:59
+Current Version:4.3.5
+Current Version Code:80
 
diff --git a/metadata/goo.TeaTimer.txt b/metadata/goo.TeaTimer.txt
index 950f69c802..86f815be12 100644
--- a/metadata/goo.TeaTimer.txt
+++ b/metadata/goo.TeaTimer.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://solidsushi.com/lab/teatimer
 Source Code:http://github.com/ralphleon/TeaTimer
diff --git a/metadata/gr.ndre.scuttloid.txt b/metadata/gr.ndre.scuttloid.txt
index 4962467900..9987a453ed 100644
--- a/metadata/gr.ndre.scuttloid.txt
+++ b/metadata/gr.ndre.scuttloid.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/ilesinge/scuttloid
diff --git a/metadata/gr.tsagi.jekyllforandroid.txt b/metadata/gr.tsagi.jekyllforandroid.txt
new file mode 100644
index 0000000000..43d0652cd3
--- /dev/null
+++ b/metadata/gr.tsagi.jekyllforandroid.txt
@@ -0,0 +1,31 @@
+Categories:Internet
+License:GPLv3
+Web Site:http://tsagi.me
+Source Code:https://github.com/tsagi/jekyll-client-for-android
+Issue Tracker:https://github.com/tsagi/jekyll-client-for-android/issues
+
+Auto Name:Jekyll for Android
+Summary:Post to Github blog
+Description:
+Post to Github-hosted Jekyll blogs.
+Supports markdown.
+
+Status:Beta
+.
+
+Repo Type:git
+Repo:https://github.com/tsagi/jekyll-client-for-android.git
+
+Build:1.0,1
+    commit=215042
+    subdir=JekyllForAndroid
+    prebuild=wget http://fossil.instinctive.eu/libsoldout-1.3.tar.bz2 && \
+        tar -C ../bypass/dep/ -xf libsoldout-1.3.tar.bz2 && \
+        sed -i 's/libsoldout/libsoldout-1.3/' ../bypass/platform/android/library/jni/Android.mk
+    buildjni=../bypass/platform/android/library/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/headrevision.BehatReporter.txt b/metadata/headrevision.BehatReporter.txt
new file mode 100644
index 0000000000..26c8ef7792
--- /dev/null
+++ b/metadata/headrevision.BehatReporter.txt
@@ -0,0 +1,27 @@
+Categories:Internet
+License:MIT
+Web Site:
+Source Code:https://github.com/headrevision/BehatReporter
+Issue Tracker:https://github.com/headrevision/BehatReporter/issues
+
+Auto Name:Behat Reporter
+Summary:Display server output
+Description:
+Show the output of the Behat server tool. See the source code page
+for requirements.
+.
+
+Repo Type:git
+Repo:https://github.com/headrevision/BehatReporter.git
+
+Build:1.0.4,5
+    commit=v1.0.4
+    rm=libs/HumanTimeApproximation.jar
+    srclibs=HumanTime@d63d
+    prebuild=echo 'source.dir=src;$$HumanTime$$/src' > ant.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.4
+Current Version Code:5
+
diff --git a/metadata/home.jmstudios.calc.txt b/metadata/home.jmstudios.calc.txt
index 13247ee6d1..503f12be1c 100644
--- a/metadata/home.jmstudios.calc.txt
+++ b/metadata/home.jmstudios.calc.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:
 Source Code:https://github.com/jochem88/clean-calculator
@@ -7,16 +7,36 @@ Issue Tracker:https://github.com/jochem88/clean-calculator/issues
 Auto Name:Calculator
 Summary:Stylish calculator
 Description:
-A calculator. Status: Beta
+A calculator.
 .
 
 Repo Type:git
 Repo:https://github.com/jochem88/clean-calculator.git
 
-Build Version:0.5,14,2bb2f,prebuild=sed -i '/reference.1/d' project.properties
+Build:0.5,14
+    commit=2bb2f
+    prebuild=sed -i '/reference.1/d' project.properties
+
+Build:0.6,15
+    commit=099b998bdb
+    prebuild=sed -i '/reference.1/d' project.properties
+
+Build:0.6.1,16
+    commit=a75af6b0ab
+    prebuild=sed -i '/reference.1/d' project.properties
+
+Build:1.0,17
+    commit=928b077789
+    prebuild=sed -i '/reference.1/d' project.properties
+
+Maintainer Notes:
+Needs a better description!
+
+No tags.
+.
 
 Auto Update Mode:None
-#No established commit pattern...
 Update Check Mode:RepoManifest
-Current Version:0.5
-Current Version Code:14
+Current Version:1.0
+Current Version Code:17
+
diff --git a/metadata/hsware.HSTempo.txt b/metadata/hsware.HSTempo.txt
index 406e7b9649..c9c9a1df43 100644
--- a/metadata/hsware.HSTempo.txt
+++ b/metadata/hsware.HSTempo.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:
 Source Code:https://github.com/hsaito/hstempo_android
diff --git a/metadata/hu.vsza.adsdroid.txt b/metadata/hu.vsza.adsdroid.txt
index 3b6e7bf86e..795dad1435 100644
--- a/metadata/hu.vsza.adsdroid.txt
+++ b/metadata/hu.vsza.adsdroid.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:MIT
 Web Site:https://github.com/dnet/adsdroid
 Source Code:https://github.com/dnet/adsdroid
@@ -7,22 +7,35 @@ Issue Tracker:https://github.com/dnet/adsdroid/issues
 Auto Name:ADSdroid
 Summary:Get technical datasheets
 Description:
-Unofficial Android app for alldatasheet.com, allowing fast access to thousands of pdfs
-for specifications about electronic items
+Unofficial Android app for alldatasheet.com, allowing fast access to thousands
+of PDFs for specifications about electronic items
 .
 
 Repo Type:git
 Repo:https://github.com/dnet/adsdroid.git
 
-#There is a tag for v1.1 but no source
-Build Version:1.0,1,v1.0,target=android-10,prebuild=\
-mkdir libs/ && wget http://jsoup.org/packages/jsoup-1.6.3.jar -P libs/
-Build Version:1.2,2,v1.2,target=android-16,prebuild=\
-mkdir libs/ && wget http://jsoup.org/packages/jsoup-1.6.3.jar -P libs/
-Build Version:1.3,3,v1.3,extlibs=jsoup/jsoup-1.6.3.jar,target=android-10
+Build:1.0,1
+    commit=v1.0
+    target=android-10
+    extlibs=jsoup/jsoup-1.6.3.jar
+
+Build:1.2,2
+    commit=v1.2
+    target=android-16
+    extlibs=jsoup/jsoup-1.6.3.jar
+
+Build:1.3,3
+    commit=v1.3
+    target=android-10
+    extlibs=jsoup/jsoup-1.6.3.jar
+
+Build:1.4,5
+    commit=v1.4
+    target=android-16
+    extlibs=jsoup/jsoup-1.6.3.jar
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:3
+Current Version:1.4
+Current Version Code:5
 
diff --git a/metadata/i4nc4mp.myLock.txt b/metadata/i4nc4mp.myLock.txt
index 5cabfef5a7..0a7d56df0a 100644
--- a/metadata/i4nc4mp.myLock.txt
+++ b/metadata/i4nc4mp.myLock.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/mylockforandroid/wiki/officialFAQ
-Source Code:https://code.google.com/p/mylockforandroid/source/list
-Issue Tracker:https://code.google.com/p/mylockforandroid/issues/list
+Source Code:https://code.google.com/p/mylockforandroid/source
+Issue Tracker:https://code.google.com/p/mylockforandroid/issues
 
 Auto Name:myLock utilities
 Summary:Lockscreen improvements
@@ -22,16 +22,14 @@ the screen in-call. Otherwise, touch input is blocked after the screen goes to s
 N.B. Disable quick unlock before using alarm (this is an issue on HTC sense devices). v1.5 comes from the same repository but a different directory, hence the slight feature differences.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://mylockforandroid.googlecode.com/svn/trunk/ML_utility
 
 #Don't have android-9
 Build Version:42,28,341,target=android-8
 
 Auto Update Mode:None
-#Doesn't always update the version numbers
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:42
 Current Version Code:28
 
diff --git a/metadata/in.ac.dtu.subtlenews.txt b/metadata/in.ac.dtu.subtlenews.txt
new file mode 100644
index 0000000000..68a99be551
--- /dev/null
+++ b/metadata/in.ac.dtu.subtlenews.txt
@@ -0,0 +1,32 @@
+Categories:Reading
+License:GPLv3
+Web Site:
+#Web Site:http://android.championswimmer.in
+Source Code:https://github.com/teamOSC/SubtleNews_Android_App
+Issue Tracker:https://github.com/teamOSC/SubtleNews_Android_App/issues
+
+Auto Name:Subtle News
+Summary:News digest
+Description:
+Connects to a SubtleNews server (source code in the same project), which
+summarizes the news for you so you have less to read; it can also be read out to you.
+.
+
+Repo Type:git
+Repo:https://github.com/teamOSC/SubtleNews_Android_App.git
+
+Build:0.7,7
+    commit=0.7
+    subdir=App
+    gradle=defaultFlavor
+
+Build:1.0,10
+    commit=1.0
+    subdir=App
+    gradle=defaultFlavor
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:10
+
diff --git a/metadata/in.shick.diode.txt b/metadata/in.shick.diode.txt
index 489ceb12f9..a9554f7dc1 100644
--- a/metadata/in.shick.diode.txt
+++ b/metadata/in.shick.diode.txt
@@ -1,10 +1,10 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/zagaberoo/diode
 Source Code:https://github.com/zagaberoo/diode
 Issue Tracker:https://github.com/zagaberoo/diode/issues
 
-Auto Name:reddit is fun
+Auto Name:Diode
 Summary:Client for reddit.com
 Description:
 Diode provides quick and easy access to Reddit on your device complete with login, commenting
@@ -15,16 +15,39 @@ and submissions. Discuss Diode with other users at the official
 Repo Type:git
 Repo:https://github.com/zagaberoo/diode.git
 
-Build Version:1.0.4,5,770905d77eac8bb960502769b591c492c70d6b86,target=android-15
-Build Version:1.0.4.1,6,85d946af7a9a,target=android-15
-Build Version:1.0.5,7,d1.0.5,target=android-15
-Build Version:1.0.6,8,d1.0.6,target=android-15
-Build Version:1.0.7,9,d1.0.7,target=android-15
-Build Version:1.0.9,11,d1.0.9,target=android-15
-Build Version:1.1.0,12,d1.1.0,target=android-15
+Build:1.0.4,5
+    commit=770905d77eac8bb960502769b591c492c70d6b86
+    target=android-15
+
+Build:1.0.4.1,6
+    commit=85d946af7a9a
+    target=android-15
+
+Build:1.0.5,7
+    commit=d1.0.5
+    target=android-15
+
+Build:1.0.6,8
+    commit=d1.0.6
+    target=android-15
+
+Build:1.0.7,9
+    commit=d1.0.7
+    target=android-15
+
+Build:1.0.9,11
+    commit=d1.0.9
+    target=android-15
+
+Build:1.1.0,12
+    commit=d1.1.0
+    target=android-15
+
+Build:1.1.1,13
+    commit=d1.1.1
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.1.0
-Current Version Code:12
+Current Version:1.1.1
+Current Version Code:13
 
diff --git a/metadata/in.shick.lockpatterngenerator.txt b/metadata/in.shick.lockpatterngenerator.txt
index 0b116d6179..9b1690ee77 100644
--- a/metadata/in.shick.lockpatterngenerator.txt
+++ b/metadata/in.shick.lockpatterngenerator.txt
@@ -1,9 +1,9 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://shick.in/android/
 Source Code:https://github.com/zagaberoo/lockpatterngenerator
 Issue Tracker:https://github.com/zagaberoo/lockpatterngenerator/issues
-Bitcoin:1JscvZEbchRUpCXYX13bJb3aF6U1yT9BwG?label=Michael%20Shick%20%28Lock%20Pattern%20Generator%29&message=Donation%20for%20Lock%20Pattern%20Generator
+Bitcoin:1JscvZEbchRUpCXYX13bJb3aF6U1yT9BwG
 
 Auto Name:Lock Pattern Generator
 Summary:Lock pattern generator
@@ -15,11 +15,20 @@ memorize it before applying it.
 Repo Type:git
 Repo:git://github.com/zagaberoo/lockpatterngenerator.git
 
-Build Version:2.0,6,02d119e5f
-Build Version:2.0.1,7,v2.0.1
+Build:2.0,6
+    commit=02d119e5f
+
+Build:2.0.1,7
+    commit=v2.0.1
+
+Build:2.1,8
+    commit=v2.1
+
+Build:2.2,9
+    commit=v2.2
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.0.1
-Current Version Code:7
+Current Version:2.2
+Current Version Code:9
 
diff --git a/metadata/info.guardianproject.browser.txt b/metadata/info.guardianproject.browser.txt
index 628b20a134..180aa69ca9 100644
--- a/metadata/info.guardianproject.browser.txt
+++ b/metadata/info.guardianproject.browser.txt
@@ -1,36 +1,46 @@
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:https://guardianproject.info/apps/orweb/
 Source Code:https://github.com/guardianproject/orweb
 Issue Tracker:https://dev.guardianproject.info/projects/orweb/issues?set_filter=1 
 
-Auto Name:Orweb v2
+Auto Name:Orweb
 Summary:Privacy-enhanced browser
 Description:
 Orweb is a companion browser to [[org.torproject.android]], the port of Tor to 
 Android. 
+
 Orbot anonymizes internet traffic by routing it through many different stages 
 and you must have that enabled first, though root isn't needed. 
-Orweb disables certain other browser features that could be used to identify you.
+Orweb disables certain other browser features that could be used to identify
+you.
 .
 
 Repo Type:git
 Repo:git://github.com/guardianproject/Orweb.git
 
-Build Version:0.2.2,3,460a5a92bc5a426f7ff710f03bc1341359a17d4b
-Build Version:0.4.2,15,3cab65406614bb43ce65133cda731f80939b3b5c
-Build Version:0.4.4,18,0.4.4,srclibs=ActionBarSherlock@6e3f2bb5,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:0.2.2,3
+    commit=460a5a92bc5a426f7ff710f03bc1341359a17d4b
+
+Build:0.4.2,15
+    commit=3cab65406614bb43ce65133cda731f80939b3b5c
+
+Build:0.4.4,18
+    commit=0.4.4
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
 # maybe a bad patch?
-Build Version:0.5.0-BETA-3,22,!incredibly slow compared to official build at 0.5.0-BETA-3a,\
-srclibs=NetCipher@94f5dc6;ActionBarSherlock@c0d437c,\
-prebuild=sed -i  's/onionkit.OrbotHelper/onionkit.ui.OrbotHelper/g' \
-           src/info/guardianproject/browser/Browser.java && \
-         sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(.2=\).*@\1$$NetCipher$$@' project.properties
+Build:0.5.0-BETA-3,22
+    disable=incredibly slow compared to official build at 0.5.0-BETA-3a
+    commit=0.5.0-BETA-3a
+    srclibs=NetCipher@94f5dc6;ActionBarSherlock@c0d437c
+    prebuild=sed -i  's/onionkit.OrbotHelper/onionkit.ui.OrbotHelper/g' src/info/guardianproject/browser/Browser.java && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$NetCipher$$@' project.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.5.0-BETA-3
-Current Version Code:22
+Current Version:0.5.1
+Current Version Code:24
 
diff --git a/metadata/info.guardianproject.cacert.txt b/metadata/info.guardianproject.cacert.txt
index a7feed93f3..8378c9f245 100644
--- a/metadata/info.guardianproject.cacert.txt
+++ b/metadata/info.guardianproject.cacert.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://guardianproject.info/2011/09/05/cacertman-app-to-address-diginotar-other-bad-cas/
 Source Code:https://github.com/guardianproject/cacert
diff --git a/metadata/info.guardianproject.gpg.txt b/metadata/info.guardianproject.gpg.txt
index b65ab756b0..5044b2f74c 100644
--- a/metadata/info.guardianproject.gpg.txt
+++ b/metadata/info.guardianproject.gpg.txt
@@ -1,26 +1,33 @@
-Category:Development
+Categories:Development
 License:GPLv3
-Web Site:
+Web Site:https://guardianproject.info/code/gnupg/
 Source Code:https://github.com/guardianproject/gnupg-for-android
-Issue Tracker:https://github.com/guardianproject/gnupg-for-android/issues
+Issue Tracker:https://dev.guardianproject.info/projects/gpgandroid/issues
 
 Auto Name:GnuPrivacyGuard
-Summary:GNUPG for Android
+Summary:GnuPG via gpgcli
 Description:
-GNU Privacy Guard Command-Line (gpgcli) gives you command line access to the
-entire GnuPG suite of encryption software.
-GPG is GNU’s tool for end-to-end secure communication and encrypted data
-storage.
-GnuPG 2.1 is the new modularized version of GnuPG that now supports OpenPGP
-and S/MIME.
+GnuPrivacyGuard extends the gpgcli command line tool to bring an integrated
+privacy engine to your Android. It gives you command line access to the entire
+GnuPG suite of encryption software. It also serves as the test bed for
+complete Android integration for all of GnuPG's crypto services, including
+OpenPGP, symmetric encryption, and more.
 
-Before using gpgcli, be sure to launch the app and let it finish its
-installation process.
-Once it has completed, then you're ready to use it.
-The easiest way to get started with gpgcli is to install
-[[jackpal.androidterm]].
-gpgcli will automatically configure Android Terminal Emulator as long as you
-have the "Allow PATH extensions" settings enabled.
+GPG is GNU’s tool for end-to-end secure communication and encrypted data
+storage. This trusted protocol is the free software alternative to PGP. This
+app is built upon GnuPG 2.1, the new modularized version of GnuPG that now
+supports S/MIME.
+
+GPG aims to provide an integrated experience, so clicking on PGP files should
+"just work". You can also share files to GPG to encrypt them. GPG will also
+respond when you click on a PGP fingerprint URL (one that starts with
+openpgp4fpr:).
+
+Before using GPG, be sure to launch the app and let it finish its installation
+process. Once it has completed, then you're ready to use it. The easiest way
+to get started with GPG is to install [[jackpal.androidterm]]. GPG will
+automatically configure Android Terminal Emulator as long as you have the
+"Allow PATH extensions" settings enabled.
 
 Status: ALPHA
 .
@@ -28,9 +35,12 @@ Status: ALPHA
 Repo Type:git
 Repo:https://github.com/guardianproject/gnupg-for-android
 
-#scanner:gnupg-for-java/src/c/libjavagnupg.64.so;scanignore=build/info.guardianproject.gpg
-Build Version:0.2,2,!.so binaries at 0.2,submodules=yes,update=.;external/ActionBarSherlock/actionbarsherlock,\
-    build=make NDK_BASE=$$NDK$$ -C external/ distclean clean-assets && make NDK_BASE=$$NDK$$ -C external/,\
+Build:0.2.1,3
+    commit=0.2.1
+    submodules=yes
+    prebuild=rm -rf external/gnupg-for-java/
+    build=make NDK_BASE=$$NDK$$ -C external/ distclean clean-assets && \
+        make NDK_BASE=$$NDK$$ -C external/
     buildjni=yes
 
 Auto Update Mode:None
diff --git a/metadata/info.guardianproject.lildebi.txt b/metadata/info.guardianproject.lildebi.txt
index 3ae253ed2b..ce58e80f48 100644
--- a/metadata/info.guardianproject.lildebi.txt
+++ b/metadata/info.guardianproject.lildebi.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:GPLv3
 Web Site:https://github.com/guardianproject/lildebi/wiki
 Source Code:https://github.com/guardianproject/lildebi
@@ -8,15 +8,9 @@ Bitcoin:1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk
 Auto Name:Lil' Debi
 Summary:Run Debian on your phone
 Description:
-Want an easy Debian chroot running that you can trust? Install Lil’ Debi, and
-you can have a Debian install running with a single click of a button. It
-builds up a whole Debian chroot on your phone entirely using debootstrap. You
-choose the release, mirror, and size of the disk image, and away it goes. It
-could take up to an hour on a slow device, then it's done.
-It includes gpgv and the Debian repository keys in the apk and verifies the
-packages it downloads in the first stage of debootstrap before installing
-them. It will also check and update a SHA1 checksum to make sure your
-debian.img file has not be tampered with.
+Lil' Debi builds up a whole Debian chroot on your phone entirely using
+debootstrap. You choose the release, mirror, and size of the disk image, and
+away it goes. It could take up to an hour on a slow device.
 
 Then it has a simple chroot manager that fscks your disk, mounts/unmounts
 things, starts/stops sshd if you have it installed, etc. You can also then use
@@ -37,14 +31,7 @@ Lil' Debi works with as few modifications to the Android system as
 possible. Currently, it only adds a /bin symlink, and a /debian mount
 directory. It does not touch /system at all.
 
-This is built from source by f-droid except for the gpgv part which can be
-built from the instructions in the
-[http://gitorious.org/f-droid/fdroiddata/blobs/master/metadata/info.guardianproject.gpg.txt metadata]
-in the fdroiddata repo. See the website for full usage instructions: or try
-running $su then #debian#shell in
-[[jackpal.androidterm]] after mounting the image.
-
-Please do try it out, use it, and report criticisms, bugs, improvements, etc.
+This is built from source by f-droid except for the gpgv part.
 
 Requires root: Yes, because it needs to run debootstrap, create dirs in /,
 mount/umount, etc.
@@ -55,19 +42,58 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/guardianproject/lildebi.git
 
-Build Version:0.2,3,0.2,submodules=yes,build=make NDK_BASE=$$NDK$$ -C external assets
-Build Version:0.3,4,0.3,submodules=yes,build=make NDK_BASE=$$NDK$$ -C external assets
-Build Version:0.4.1,6,!next version just released at 0.4.1,submodules=yes,build=make NDK_BASE=$$NDK$$ -C external assets
-Build Version:0.4.2,7,0.4.2,build=make NDK_BASE=$$NDK$$ -C external assets,submodules=yes
-Build Version:0.4.3,8,0.4.3,build=make NDK_BASE=$$NDK$$ -C external assets,submodules=yes
-Build Version:0.4.4,9,0.4.4,build=make NDK_BASE=$$NDK$$ -C external assets,submodules=yes
-Build Version:0.4.5,10,0.4.5,build=make NDK_BASE=$$NDK$$ -C external assets,submodules=yes
+Build:0.2,3
+    commit=0.2
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.3,4
+    commit=0.3
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.1,6
+    disable=next version just released at 0.4.1
+    commit=0.4.1
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.2,7
+    commit=0.4.2
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.3,8
+    commit=0.4.3
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.4,9
+    commit=0.4.4
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.5,10
+    commit=0.4.5
+    submodules=yes
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Build:0.4.6,11
+    commit=0.4.6
+    submodules=yes
+    scanignore=assets/gpgv
+    build=make NDK_BASE=$$NDK$$ -C external assets
+
+Maintainer Notes:
+It should be possible to build gpgv - see See info.guardianproject.gpg README
+to build using srclibs=GNUPG
+
+ external/data/data/info.guardianproject.gpg/app_opt/bin/gpg2-static :
+ mv external/data/data/info.guardianproject.gpg/gpgv2-static ../assets/gpgv
+.
 
-# See info.guardianproject.gpg README to build using srclibs=GNUPG
-# external/data/data/info.guardianproject.gpg/app_opt/bin/gpg2-static :
-# mv external/data/data/info.guardianproject.gpg/gpgv2-static ../assets/gpgv
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.4.5
-Current Version Code:10
+Current Version:0.4.6
+Current Version Code:11
 
diff --git a/metadata/info.guardianproject.notepadbot.txt b/metadata/info.guardianproject.notepadbot.txt
new file mode 100644
index 0000000000..4df680b56d
--- /dev/null
+++ b/metadata/info.guardianproject.notepadbot.txt
@@ -0,0 +1,37 @@
+Categories:Office
+License:Apache2
+Web Site:https://guardianproject.info
+Source Code:https://github.com/guardianproject/notepadbot
+Issue Tracker:https://github.com/guardianproject/notepadbot/issues
+
+Auto Name:NoteCipher
+Summary:Notepad with lock
+Description:
+Simple app for taking notes that encrypts everything behind a password.
+
+Status: Beta.
+.
+
+Repo Type:git
+Repo:https://github.com/guardianproject/notepadbot.git
+
+Build:0.1,12
+    commit=8afa912172ce
+    subdir=app
+    srclibs=2:ActionBarSherlock@4a79d;3:NumberPicker-SimonVT@b4562;1:Cacheword@d49c128bb;IOCipher@v0.1
+    prebuild=wget https://s3.amazonaws.com/sqlcipher/SQLCipher+for+Android+v2.2.2.zip && \
+        rm $$Cacheword$$/libs/iocipher.jar && \
+        $$SDK$$/tools/android update project -p $$Cacheword$$ -l ../../IOCipher
+    build=unzip SQLCipher+for+Android+v2.2.2.zip && \
+        cp -R SQLCipher\ for\ Android\ v2.2.2/libs/* libs/ && \
+        cp -R SQLCipher\ for\ Android\ v2.2.2/assets/* assets/ && \
+        rm libs/guava-r09.jar && \
+        cp libs/android-support-v4.jar $$Cacheword$$/libs/ && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        cp libs/sqlcipher.jar $$Cacheword$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.1
+Current Version Code:12
+
diff --git a/metadata/info.guardianproject.otr.app.im.txt b/metadata/info.guardianproject.otr.app.im.txt
index 2513b062b3..93195192d3 100644
--- a/metadata/info.guardianproject.otr.app.im.txt
+++ b/metadata/info.guardianproject.otr.app.im.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://dev.guardianproject.info/projects/gibberbot
 Source Code:https://github.com/guardianproject/Gibberbot
@@ -18,37 +18,92 @@ The app used to be called GibberBot.
 Repo Type:git
 Repo:https://github.com/guardianproject/Gibberbot.git
 
-Build Version:0.0.7-RC1,25,e17dbbcf338af00466cabc5178634cd0d5ffded8,target=android-4
-Build Version:0.0.8-FINAL,31,e4b49ca9508477564c2cba4cfe2821b270281218,target=android-11
-Build Version:0.0.9-RC3,34,9311f2ebdcf06660fa4f145a1c2d88b6b15341f3,target=android-15
-Build Version:0.0.9-RC4,35,b3a7433be1,target=android-15
-Build Version:0.0.10-RC2,37,v10-RC2,srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && mkdir assets
-Build Version:0.0.10-RC6,41,0.0.10-RC6,forceversion=yes,forcevercode=yes,\
-srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:0.0.7-RC1,25
+    commit=e17dbbcf338af00466cabc5178634cd0d5ffded8
+    target=android-4
+
+Build:0.0.8-FINAL,31
+    commit=e4b49ca9508477564c2cba4cfe2821b270281218
+    target=android-11
+
+Build:0.0.9-RC3,34
+    commit=9311f2ebdcf06660fa4f145a1c2d88b6b15341f3
+    target=android-15
+
+Build:0.0.9-RC4,35
+    commit=b3a7433be1
+    target=android-15
+
+Build:0.0.10-RC2,37
+    commit=v10-RC2
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        mkdir assets
+
+Build:0.0.10-RC6,41
+    commit=0.0.10-RC6
+    forceversion=yes
+    forcevercode=yes
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
 # Can't use build.bash (fdroid is dash only) script so add the output as a 
 #   patch and build the jar manually
-Build Version:0.0.11-RC5,57,92db4fe01571,\
-submodules=yes,\
-patch=otr-asmack.patch,\
-update=.;external/ActionBarSherlock/library;external/\
-MemorizingTrustManager;external/OnionKit/library,\
-prebuild=rm -rf tests/ META-INF/ robo-tests/ gitian/ proguard-project.txt && \
-         echo "sdk-location=$$SDK$$" > external/asmack/local.properties,\
-build=ant -Dbuild.all=true -f external/asmack/build.xml && \
-      mv external/asmack/build/asmack-android-4.jar libs/
-Build Version:12.4.1,82,!binaries ee9e3dcc07134,submodules=yes,\
-prebuild=\
-    ./update-ant-build.sh && \
-    echo "android.library=true" >> external/MessageBar/library/project.properties && \
-    echo "sdk-location=$$SDK$$" >> external/asmack/local.properties && \
-    rm -f external/SlidingMenu/example/libs/crittercism*,\
-build=\
-    (cd external/asmack && ./build.bash && cp build/asmack-android-4.jar ../../libs)
+Build:0.0.11-RC5,57
+    commit=92db4fe01571
+    submodules=yes
+    update=.;external/ActionBarSherlock/library;external/MemorizingTrustManager;external/OnionKit/library
+    patch=otr-asmack.patch
+    prebuild=rm -rf tests/ META-INF/ robo-tests/ gitian/ proguard-project.txt && \
+        echo "sdk-location=$$SDK$$" > external/asmack/local.properties
+    build=ant -Dbuild.all=true -f external/asmack/build.xml && \
+        mv external/asmack/build/asmack-android-4.jar libs/
+
+Build:12.4.1,82
+    disable=prebuilt binaries in source
+    commit=ee9e3dcc07134
+    submodules=yes
+    prebuild=./update-ant-build.sh && \
+        echo "android.library=true" >> external/MessageBar/library/project.properties && \
+        echo "sdk-location=$$SDK$$" >> external/asmack/local.properties && \
+        rm -f external/SlidingMenu/example/libs/crittercism*
+    build=(cd external/asmack && \
+        ./build.bash && \
+        cp build/asmack-android-4.jar ../../libs)
+
+Build:12.7.1,92
+    disable=prebuilt binaries issues - see https://dev.guardianproject.info/issues/2201
+    commit=12.7.1
+    submodules=yes
+    prebuild=./update-ant-build.sh && \
+        echo "android.library=true" >> external/MessageBar/library/project.properties && \
+        echo "sdk-location=$$SDK$$" >> external/asmack/local.properties && \
+        rm -f external/SlidingMenu/example/libs/crittercism*
+    build=(cd external/asmack && \
+        ./build.bash && \
+        cp build/asmack-android-4.jar ../../libs)
+
+Build:13.1.2,107
+    commit=13.1.2
+    submodules=yes
+    update=no
+    srclibs=IOCipher@v0.1
+    prebuild=rm external/cacheword/cachewordlib/libs/iocipher.jar && \
+        $$SDK$$/tools/android update project -p external/cacheword/cachewordlib  -l ../../../../srclib/IOCipher && \
+        wget https://s3.amazonaws.com/sqlcipher/SQLCipher+for+Android+v2.2.2.zip && \
+        echo "sdk-location=$$SDK$$" >> external/asmack/local.properties && \
+        rm -f external/SlidingMenu/example/libs/crittercism*
+    build=unzip SQLCipher+for+Android+v2.2.2.zip && \
+        cp -R SQLCipher\ for\ Android\ v2.2.2/libs/* libs && \
+        cp -R SQLCipher\ for\ Android\ v2.2.2/assets . && \
+        rm libs/guava-r09.jar && \
+        ./update-ant-build.sh && \
+        cd external/asmack && \
+        ./build.bash && \
+        cp build/asmack-android-7.jar ../../libs
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:12.6.5
-Current Version Code:90
+Current Version:13.1.2
+Current Version Code:107
 
diff --git a/metadata/info.guardianproject.pixelknot.txt b/metadata/info.guardianproject.pixelknot.txt
new file mode 100644
index 0000000000..ebf7d38061
--- /dev/null
+++ b/metadata/info.guardianproject.pixelknot.txt
@@ -0,0 +1,26 @@
+Category:Office
+License:GPLv3
+Web Site:https://guardianproject.info
+Source Code:https://github.com/guardianproject/PixelKnot
+Issue Tracker:https://github.com/guardianproject/PixelKnot/issues
+
+Auto Name:PixelKnot
+Summary:Hide messages inside files
+Description:
+Image steganography app with old school F5 steganography
+.
+
+Repo Type:git
+Repo:https://github.com/guardianproject/PixelKnot.git
+
+Build:0.3.1,4
+    commit=0.3.1
+    subdir=app
+    init=sed -i '/reference/d' project.properties
+    srclibs=2:ActionBarSherlock@90939dc;1:F5@ce9c78497a0cc22a
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.3.1
+Current Version Code:4
+
diff --git a/metadata/info.lamatricexiste.network.txt b/metadata/info.lamatricexiste.network.txt
index bd6dc95644..bb1833c05f 100644
--- a/metadata/info.lamatricexiste.network.txt
+++ b/metadata/info.lamatricexiste.network.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:http://rorist.github.com/android-network-discovery/
 Source Code:http://rorist.github.com/android-network-discovery/
@@ -13,11 +13,22 @@ Discover network (WiFi/3G) hosts, scan ports, etc.
 Repo Type:git
 Repo:https://github.com/rorist/android-network-discovery.git
 
-Build Version:0.3.4,42,32bffddce7e37a3c12f8,oldsdkloc=yes
-Build Version:0.3.5,43,e89a9791a646a1abbf5b4916e86784d167b89034,oldsdkloc=yes,target=android-8,init=rm build.properties
+Build:0.3.4,42
+    commit=32bffddce7e37a3c12f8
+    oldsdkloc=yes
+
+Build:0.3.5,43
+    commit=e89a9791a646a1abbf5b4916e86784d167b89034
+    init=rm build.properties
+    oldsdkloc=yes
+    target=android-8
+
+Maintainer Notes:
+RepoManifest doesn't work for this. (And note that the 0.3.5 release is in a
+branch)
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:0.3.5
 Current Version Code:43
diff --git a/metadata/info.staticfree.SuperGenPass.txt b/metadata/info.staticfree.SuperGenPass.txt
index b0fbed7e97..2e9fe927d7 100644
--- a/metadata/info.staticfree.SuperGenPass.txt
+++ b/metadata/info.staticfree.SuperGenPass.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://staticfree.info/projects/sgp/
 Source Code:https://staticfree.info/git/SuperGenPass.git
@@ -21,7 +21,7 @@ Repo:git://staticfree.info/git/SuperGenPass/
 
 Build Version:2.1,17,e22b86b5cd132cba8,prebuild=rm SuperGenPass.apk && mv lib libs
 Build Version:2.2.1,19,2.2.1,prebuild=rm SuperGenPass.apk && mv lib libs
-Build Version:2.2.2,20,2.2.2,prebuild=rm SuperGenPass.apk && mv lib libs
+Build Version:2.2.2,20,2.2.2,prebuild=mv lib libs
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
diff --git a/metadata/info.staticfree.android.robotfindskitten.txt b/metadata/info.staticfree.android.robotfindskitten.txt
index c6d260b3d8..a75381839b 100644
--- a/metadata/info.staticfree.android.robotfindskitten.txt
+++ b/metadata/info.staticfree.android.robotfindskitten.txt
@@ -1,7 +1,7 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://staticfree.info/projects/rfk/
-Source Code:https://staticfree.info/git/robotfindskitten/
+Source Code:https://staticfree.info/git/robotfindskitten.git
 Issue Tracker:
 FlattrID:633876
 
@@ -15,10 +15,10 @@ Repo Type:git
 Repo:git://staticfree.info/git/robotfindskitten/
 
 Build Version:0.9.406,6,0e2f7ec02268397073d82b1b69a9fac13b634650,prebuild=rm *.apk
-Build Version:1.0.701,7,5b6ca5749ba139eef7930c5f019d05dd66a52bcb,prebuild=rm *.apk
+Build Version:1.0.701,7,v1.0.701
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.0.701
 Current Version Code:7
 
diff --git a/metadata/info.staticfree.android.twentyfourhour.txt b/metadata/info.staticfree.android.twentyfourhour.txt
index e35c7e45f2..949b430347 100644
--- a/metadata/info.staticfree.android.twentyfourhour.txt
+++ b/metadata/info.staticfree.android.twentyfourhour.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://staticfree.info/projects/24h_clock/
-Source Code:http://staticfree.info/git/24hAnalogWidget.git
+Source Code:https://staticfree.info/git/24hAnalogWidget.git
 Issue Tracker:
 FlattrID:86174
 
@@ -22,10 +22,10 @@ Repo:git://staticfree.info/git/24hAnalogWidget
 
 Build Version:0.3.1,5,d7716a517ccc7d022a42ff49abb02d130961eabc
 Build Version:0.4.1,7,7687b8495ff6bcbed5070f70f94c1deae453eebf,rm=24hAnalogWidget.apk
-Build Version:0.4.2,8,511f9ff,rm=24hAnalogWidget.apk
+Build Version:0.4.2,8,0.4.2
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:0.4.2
 Current Version Code:8
 
diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index 521deeac99..b25c8a23f3 100644
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://staticfree.info/projects/units/
 Source Code:https://staticfree.info/git/Units.git
@@ -14,13 +14,18 @@ A powerful unit-aware calculator and converter inspired by GNU Units.
 Repo Type:git
 Repo:git://staticfree.info/git/Units/
 
-Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
-Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
-Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,prebuild=rm Units.apk && mv lib/ libs/
+Build:0.8,7
+    commit=8be8c10c67152783b6871a70d077a0758e5086ba
+
+Build:0.9,8
+    commit=3cde1f8d6b822ddcee23f984fab53e7bad3817df
+
+Build:1.0,9
+    commit=1.0
+    prebuild=mv lib/ libs/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:9
 
diff --git a/metadata/info.toyonos.hfr4droid.txt b/metadata/info.toyonos.hfr4droid.txt
index 9d23568b16..3271e290e1 100644
--- a/metadata/info.toyonos.hfr4droid.txt
+++ b/metadata/info.toyonos.hfr4droid.txt
@@ -1,9 +1,9 @@
 Disabled:Functions badly: is not able to progress beyond forum list
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/hfr4droid/
-Source Code:http://code.google.com/p/hfr4droid/source/list
-Issue Tracker:http://code.google.com/p/hfr4droid/issues/list
+Source Code:http://code.google.com/p/hfr4droid/source
+Issue Tracker:http://code.google.com/p/hfr4droid/issues
 
 Auto Name:
 Summary:Consulter le forum HFR
diff --git a/metadata/io.github.sanbeg.flashlight.txt b/metadata/io.github.sanbeg.flashlight.txt
new file mode 100644
index 0000000000..895ef82a08
--- /dev/null
+++ b/metadata/io.github.sanbeg.flashlight.txt
@@ -0,0 +1,24 @@
+Categories:System
+License:GPLv3
+Web Site:https://sanbeg.github.io/flashlight
+Source Code:https://github.com/sanbeg/flashlight
+Issue Tracker:https://github.com/sanbeg/flashlight/issues
+
+Auto Name:Open FlashLight
+Summary:Camera LED toggle
+Description:
+This one is basic, turn it on with the button and quit the app
+to turn it off.
+.
+
+Repo Type:git
+Repo:https://github.com/sanbeg/flashlight.git
+
+Build:1.0,1
+    commit=01158
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/it.devapp.android.txt b/metadata/it.devapp.android.txt
index 695f104d51..d581b8c630 100644
--- a/metadata/it.devapp.android.txt
+++ b/metadata/it.devapp.android.txt
@@ -1,6 +1,6 @@
 Disabled:Pointless without Google Maps
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://sourceforge.net/projects/geosearch/
 Source Code:http://sourceforge.net/projects/geosearch/files/source/
diff --git a/metadata/it.ecosw.dudo.txt b/metadata/it.ecosw.dudo.txt
index 47b85fd4e3..9e784a4bd4 100644
--- a/metadata/it.ecosw.dudo.txt
+++ b/metadata/it.ecosw.dudo.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:https://code.google.com/p/dudo/
-Source Code:https://code.google.com/p/dudo/source/checkout
-Issue Tracker:https://code.google.com/p/dudo/issues/list
+Source Code:https://code.google.com/p/dudo/source
+Issue Tracker:https://code.google.com/p/dudo/issues
 
 Auto Name:Dudo
 Summary:Dudo game
@@ -26,8 +26,13 @@ init=rm -rf bin/ gen/
 Build Version:0.5.1,13,8f2c3c582ea9,subdir=Dudo,forceversion=yes,target=android-17,\
 init=rm -rf bin/ gen/
 
+Build:0.5.2,14
+	commit=9a52e28dfc48
+	subdir=Dudo
+	forceversion=yes
+	target=android-17
+
 Auto Update Mode:None
-# also on gcode downloads
 Update Check Mode:RepoManifest
 Current Version:0.5.2 @ 15th-Sep-13
 Current Version Code:14
diff --git a/metadata/it.gmariotti.android.apps.dashclock.extensions.battery.txt b/metadata/it.gmariotti.android.apps.dashclock.extensions.battery.txt
index 6e3e7ad5d7..984398f498 100644
--- a/metadata/it.gmariotti.android.apps.dashclock.extensions.battery.txt
+++ b/metadata/it.gmariotti.android.apps.dashclock.extensions.battery.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:
 Source Code:https://github.com/gabrielemariotti/dashclockbattery
diff --git a/metadata/it.gtd.abreakout.GameActivity.txt b/metadata/it.gtd.abreakout.GameActivity.txt
index c1ba0cc042..175fee8095 100644
--- a/metadata/it.gtd.abreakout.GameActivity.txt
+++ b/metadata/it.gtd.abreakout.GameActivity.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:NetBSD
 Web Site:http://en.wikipedia.org/wiki/Breakout_(video_game)
 Source Code:https://github.com/thypon/abreakout
diff --git a/metadata/it.iiizio.epubator.txt b/metadata/it.iiizio.epubator.txt
index 64aafde465..424e82da85 100644
--- a/metadata/it.iiizio.epubator.txt
+++ b/metadata/it.iiizio.epubator.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://sourceforge.net/p/epubator
 Source Code:http://sourceforge.net/p/epubator/code
diff --git a/metadata/it.mn.salvi.linuxDayOSM.txt b/metadata/it.mn.salvi.linuxDayOSM.txt
new file mode 100644
index 0000000000..e7364d8134
--- /dev/null
+++ b/metadata/it.mn.salvi.linuxDayOSM.txt
@@ -0,0 +1,23 @@
+Categories:Navigation
+License:GPLv3
+Web Site:
+Source Code:https://github.com/DocSalvi/LinuxDayAppAndroid
+Issue Tracker:https://github.com/DocSalvi/LinuxDayAppAndroid/issues
+
+Auto Name:LinuxDayOSM
+Summary:Info on Linux day events in Italy
+Description:
+Shows on a map the location of Linux days and Linux User Groups. 
+.
+
+Repo Type:git
+Repo:https://github.com/DocSalvi/LinuxDayAppAndroid.git
+
+Build:1.6.1,5
+    commit=ae13d2a15e5e
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.6.1
+Current Version Code:5
+
diff --git a/metadata/it.sasabz.android.sasabus.txt b/metadata/it.sasabz.android.sasabus.txt
index cd8deaa863..991020cd93 100644
--- a/metadata/it.sasabz.android.sasabus.txt
+++ b/metadata/it.sasabz.android.sasabus.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://sasabus.org
 Source Code:https://github.com/SASAbus/SASAbus
diff --git a/metadata/it.sineo.android.noFrillsCPUClassic.txt b/metadata/it.sineo.android.noFrillsCPUClassic.txt
index 15457362c0..c38f108d5f 100644
--- a/metadata/it.sineo.android.noFrillsCPUClassic.txt
+++ b/metadata/it.sineo.android.noFrillsCPUClassic.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:
 Source Code:https://github.com/hrk/no-frills-cpu-classic
diff --git a/metadata/ivl.android.moneybalance.txt b/metadata/ivl.android.moneybalance.txt
index e50df1b2fb..f982b34441 100644
--- a/metadata/ivl.android.moneybalance.txt
+++ b/metadata/ivl.android.moneybalance.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/inguin/moneybalance
diff --git a/metadata/jackpal.androidterm.txt b/metadata/jackpal.androidterm.txt
index 147b583d5f..d2c7668409 100644
--- a/metadata/jackpal.androidterm.txt
+++ b/metadata/jackpal.androidterm.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/jackpal/Android-Terminal-Emulator/wiki
 Source Code:https://github.com/jackpal/Android-Terminal-Emulator
@@ -17,19 +17,62 @@ PC-keyboard-layout in Android 4.1 are well suited to terminal work.
 Repo Type:git
 Repo:https://github.com/jackpal/Android-Terminal-Emulator.git
 
-Build Version:1.0.41,42,10d20881b611a99842bbe42046f98218e6381250,buildjni=yes
-Build Version:1.0.44,45,v1.0.44,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.45,46,v1.0.45,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.47,48,v1.0.47,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.48,49,v1.0.48,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.49,50,v1.0.49,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.50,51,v1.0.50,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.51,52,v1.0.51,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.52,53,v1.0.52,buildjni=yes,update=.;libraries/emulatorview
-Build Version:1.0.53,54,v1.0.53,buildjni=yes,update=.;libraries/emulatorview
+Build:1.0.41,42
+    commit=10d20881b611a99842bbe42046f98218e6381250
+    buildjni=yes
+
+Build:1.0.44,45
+    commit=v1.0.44
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.45,46
+    commit=v1.0.45
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.47,48
+    commit=v1.0.47
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.48,49
+    commit=v1.0.48
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.49,50
+    commit=v1.0.49
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.50,51
+    commit=v1.0.50
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.51,52
+    commit=v1.0.51
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.52,53
+    commit=v1.0.52
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.53,54
+    commit=v1.0.53
+    update=.;libraries/emulatorview
+    buildjni=yes
+
+Build:1.0.54,55
+    commit=v1.0.54
+    update=.;libraries/emulatorview
+    buildjni=yes
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.0.53
-Current Version Code:54
+Current Version:1.0.54
+Current Version Code:55
 
diff --git a/metadata/jackpal.droidexaminer.txt b/metadata/jackpal.droidexaminer.txt
index 7369f70e02..549f65358c 100644
--- a/metadata/jackpal.droidexaminer.txt
+++ b/metadata/jackpal.droidexaminer.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2	
 Web Site:
 Source Code:https://bitbucket.org/wiffenproof/droid-examiner
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
index c7deb0c218..a5932f7f89 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2+
 Web Site:http://justplayer-dev.blogspot.jp/
 Source Code:https://bitbucket.org/yokmama/just-player-providers/src
diff --git a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
index 5d927da6ba..b26d5296ec 100644
--- a/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
+++ b/metadata/jp.co.kayo.android.localplayer.ds.podcast.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2
 Web Site:http://justplayer-dev.blogspot.jp/
 Source Code:https://bitbucket.org/yokmama/just-player-providers/src
diff --git a/metadata/jp.co.kayo.android.localplayer.txt b/metadata/jp.co.kayo.android.localplayer.txt
index d8fdc3774f..82e7f9867f 100644
--- a/metadata/jp.co.kayo.android.localplayer.txt
+++ b/metadata/jp.co.kayo.android.localplayer.txt
@@ -1,4 +1,5 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:GPLv3
 Web Site:http://justplayer-dev.blogspot.jp/
 Source Code:https://bitbucket.org/yokmama/just-player/src
diff --git a/metadata/jp.co.omronsoft.openwnn.txt b/metadata/jp.co.omronsoft.openwnn.txt
index 5a007ba2e1..5435af8a82 100644
--- a/metadata/jp.co.omronsoft.openwnn.txt
+++ b/metadata/jp.co.omronsoft.openwnn.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://android.googlesource.com/platform/packages/inputmethods/OpenWnn
diff --git a/metadata/jp.co.qsdn.android.jinbei3d.txt b/metadata/jp.co.qsdn.android.jinbei3d.txt
index 110aad3fe3..3ff372b0da 100644
--- a/metadata/jp.co.qsdn.android.jinbei3d.txt
+++ b/metadata/jp.co.qsdn.android.jinbei3d.txt
@@ -1,4 +1,5 @@
-Category:Wallpaper
+AntiFeatures:UpstreamNonFree
+Categories:Wallpaper
 License:Apache2
 Web Site:https://gitorious.org/jinbei3d/jinbei3d
 Source Code:https://gitorious.org/jinbei3d/jinbei3d
@@ -32,10 +33,8 @@ echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
 Build Version:1.0.11,12,v1.0.11,srclibs=MobAdMob@2d5736,prebuild=\
 echo "android.library.reference.1=$$MobAdMob$$" >> project.properties
 
-#Could remove internet permission next time
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0.11
 Current Version Code:12
 
diff --git a/metadata/jp.gr.java_conf.hatalab.mnv.txt b/metadata/jp.gr.java_conf.hatalab.mnv.txt
index 1dcf72b100..b97779e902 100644
--- a/metadata/jp.gr.java_conf.hatalab.mnv.txt
+++ b/metadata/jp.gr.java_conf.hatalab.mnv.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2+
 Web Site:http://hatapy.web.fc2.com/mininoteviewer.html
 Source Code:https://bitbucket.org/dalb8/mininoteviewer
diff --git a/metadata/jp.ksksue.app.terminal.txt b/metadata/jp.ksksue.app.terminal.txt
index bba3ee6483..78581fb577 100644
--- a/metadata/jp.ksksue.app.terminal.txt
+++ b/metadata/jp.ksksue.app.terminal.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://ksksue.com/wiki
 Source Code:https://github.com/ksksue/Android-USB-Serial-Monitor-Lite
diff --git a/metadata/jp.sawada.np2android.txt b/metadata/jp.sawada.np2android.txt
index 3706ee626f..38f7ee0209 100644
--- a/metadata/jp.sawada.np2android.txt
+++ b/metadata/jp.sawada.np2android.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://np2android.sf.net
 Source Code:http://sf.net/p/np2android/code/
diff --git a/metadata/jp.sblo.pandora.aGrep.txt b/metadata/jp.sblo.pandora.aGrep.txt
index 16f0123fca..5ae1a57524 100644
--- a/metadata/jp.sblo.pandora.aGrep.txt
+++ b/metadata/jp.sblo.pandora.aGrep.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:NYSLv0.9982
 Web Site:https://github.com/jiro-aqua/aGrep
 Source Code:https://github.com/jiro-aqua/aGrep
@@ -20,8 +20,7 @@ Build Version:0.2.5,9,!Source code not published
 Build Version:0.2.7,11,agrep027,buildjni=yes,rm=libs/armeabi/libuniversalchardet.so
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.2.7
 Current Version Code:11
 
diff --git a/metadata/jp.sfjp.webglmol.NDKmol.txt b/metadata/jp.sfjp.webglmol.NDKmol.txt
index f884537194..7d1b0425f3 100644
--- a/metadata/jp.sfjp.webglmol.NDKmol.txt
+++ b/metadata/jp.sfjp.webglmol.NDKmol.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:LGPL
 Web Site:http://webglmol.sourceforge.jp/
 Source Code:https://github.com/biochem-fan/NDKmol
@@ -19,12 +19,16 @@ molecules or load pdb files via the sdcard
 Repo Type:git
 Repo:https://github.com/biochem-fan/NDKmol.git
 
-Build Version:0.91,14,5f4f9870d3,buildjni=yes
-Build Version:0.92,15,8724f587,buildjni=yes
+Build:0.91,14
+    commit=5f4f9870d3
+    buildjni=yes
+
+Build:0.92,15
+    commit=8724f587
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.92
-Current Version Code:15
+Update Check Mode:RepoManifest
+Current Version:0.93
+Current Version Code:16
 
diff --git a/metadata/jp.softstudio.DriversLicenseReader.txt b/metadata/jp.softstudio.DriversLicenseReader.txt
new file mode 100644
index 0000000000..507b5d749f
--- /dev/null
+++ b/metadata/jp.softstudio.DriversLicenseReader.txt
@@ -0,0 +1,23 @@
+Categories:Office
+License:MIT
+Web Site:
+Source Code:https://github.com/soft-studio/NFC_DriversLicenseReader
+Issue Tracker:https://github.com/soft-studio/NFC_DriversLicenseReader/issues
+
+Auto Name:運転免許証リーダー
+Name:NFC Drivers License Reader
+Summary:Read Japanese driving licenses
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/soft-studio/NFC_DriversLicenseReader.git
+
+Build:1.4,5
+    commit=d04e9e9d90184c
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.4
+Current Version Code:5
+
diff --git a/metadata/jpf.android.diary.txt b/metadata/jpf.android.diary.txt
index 62333da594..922f0edefb 100644
--- a/metadata/jpf.android.diary.txt
+++ b/metadata/jpf.android.diary.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://josep-portella.com/en/software/diary/
 Source Code:http://git.savannah.gnu.org/cgit/diary.git
diff --git a/metadata/jupiter.broadcasting.live.tv.txt b/metadata/jupiter.broadcasting.live.tv.txt
index 8338606627..99a0c2ea0c 100644
--- a/metadata/jupiter.broadcasting.live.tv.txt
+++ b/metadata/jupiter.broadcasting.live.tv.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:https://github.com/ShaneQful/Jupiter-Broadcasting-Android-App
 Source Code:https://github.com/ShaneQful/Jupiter-Broadcasting-Android-App
@@ -25,8 +25,7 @@ Build Version:2.2.3,8,d470760d67
 Build Version:2.2.4,9,55114f
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.2.4
 Current Version Code:9
 
diff --git a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
index 8cca91ac33..00f53f4b2f 100644
--- a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
+++ b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/diktofon/
 Source Code:https://github.com/Kaljurand/Diktofon/
-Issue Tracker:http://code.google.com/p/diktofon/issues/list
+Issue Tracker:http://code.google.com/p/diktofon/issues
 
 Auto Name:Diktofon
 Summary:Take voice notes
@@ -25,8 +25,7 @@ Build Version:0.9.80,980,v0.9.80,target=android-10,subdir=app,extlibs=\
 json-simple/json-simple-1.1.1.jar;net-speech-api/net-speech-api-0.1.8.jar
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.9.80
 Current Version Code:980
 
diff --git a/metadata/kdk.android.simplydo.txt b/metadata/kdk.android.simplydo.txt
index e81a53a323..ab5202a376 100644
--- a/metadata/kdk.android.simplydo.txt
+++ b/metadata/kdk.android.simplydo.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://code.google.com/p/simply-do/
-Source Code:http://code.google.com/p/simply-do/source/checkout
-Issue Tracker:http://code.google.com/p/simply-do/issues/list
+Source Code:http://code.google.com/p/simply-do/source
+Issue Tracker:http://code.google.com/p/simply-do/issues
 
 Auto Name:Simply Do
 Summary:Simple item list manager
diff --git a/metadata/kr.hybdms.sidepanel.txt b/metadata/kr.hybdms.sidepanel.txt
index 92f02e337c..e8c80cf467 100644
--- a/metadata/kr.hybdms.sidepanel.txt
+++ b/metadata/kr.hybdms.sidepanel.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://hybdms.blogspot.com.es/
 Source Code:https://github.com/sukso96100/SidePanel
-Issue Tracker:https://github.com/sukso96100/SidePanel
+Issue Tracker:https://github.com/sukso96100/SidePanel/issues
 Donate:http://hybdms.blogspot.kr/p/donate-me.html
 
 Auto Name:SidePanel
diff --git a/metadata/kr.softgear.multiping.txt b/metadata/kr.softgear.multiping.txt
new file mode 100644
index 0000000000..323601f0d2
--- /dev/null
+++ b/metadata/kr.softgear.multiping.txt
@@ -0,0 +1,26 @@
+AntiFeatures:UpstreamNonFree
+Category:Internet
+License:Apache2
+Web Site:http://softgearko.blogspot.com
+Source Code:https://github.com/softgearko/MultiPing-for-Android
+Issue Tracker:https://github.com/softgearko/MultiPing-for-Android/issues
+
+Auto Name:MultiPing
+Summary:Ping multiple websites at once
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/softgearko/MultiPing-for-Android.git
+
+Build Version:0.11,11,de335d,\
+rm=res/values/attrs.xml;libs/admob-sdk-android.jar,\
+prebuild=\
+  sed -i '47\,53d' res/layout/main.xml && \
+  sed -i '5s/3/4/g;7s/true/false/g' AndroidManifest.xml
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.11
+Current Version Code:11
+
diff --git a/metadata/li.klass.fhem.txt b/metadata/li.klass.fhem.txt
index 540e36414b..806f04b8b0 100644
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@@ -1,4 +1,5 @@
-Category:Internet
+AntiFeatures:UpstreamNonFree
+Categories:Internet
 License:GPL
 Web Site:http://andfhem.klass.li/
 Source Code:https://github.com/klassm/andFHEM
@@ -10,35 +11,48 @@ Description:
 A client for the FHEM software for home automation.
 
 Admob and Amazon Billing nonfree libraries were removed in 2.2.8,
-which is what the Premium version offers.
+which is what the Premium version offers. Due to these proprietary
+dependencies, future updates in F-Droid are unlikely.
 .
 
 Repo Type:git
 Repo:https://github.com/klassm/andFHEM.git
 
-Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.5.8,58,19ebe524d48630db88c28d44872e5cbc84c885d6,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:2.2.8,128,f3a50cc11,subdir=app,\
-srclibs=MobAdMob@2d5736;ActionBarSherlock@4.2.0,prebuild=\
-rm -rf src/li/klass/fhem/billing/amazon libs/amazon*.jar libs/GoogleAd*.jar \
-../ActionBarSherlock ../tests ../build-utils && \
-sed -i  '28d;s/AMAZON(AmazonBillingProvider.INSTANCE)\, //g' \
-src/li/klass/fhem/billing/BillingService.java && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-echo "android.library.reference.2=$$MobAdMob$$" >> project.properties && \
-sed -i '184\,190d' AndroidManifest.xml
-Build Version:2.4.1,141,34dce80f,subdir=app,\
-srclibs=MobAdMob@2d5736;ActionBarSherlock@4.2.0,\
-prebuild=rm -rf src/li/klass/fhem/billing/amazon libs/amazon*.jar \
-         libs/GoogleAd*.jar ../ActionBarSherlock ../tests ../build-utils && \
-         sed -i  '28d;s/AMAZON(AmazonBillingProvider.INSTANCE)\, //g' \
-         src/li/klass/fhem/billing/BillingService.java && \
-         sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         echo "android.library.reference.2=$$MobAdMob$$" >> \
-         project.properties && sed -i '184\,190d' AndroidManifest.xml
+Build:1.5.0,51
+    commit=b7dbf11a18ca66f20e2489d2904773689b2bc24a
+    init=rm ant.properties
+    srclibs=ActionBarSherlock@436230d
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.5.8,58
+    commit=19ebe524d48630db88c28d44872e5cbc84c885d6
+    init=rm ant.properties
+    srclibs=ActionBarSherlock@436230d
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:2.2.8,128
+    commit=f3a50cc11
+    subdir=app
+    srclibs=MobAdMob@2d5736;ActionBarSherlock@4.2.0
+    prebuild=rm -rf src/li/klass/fhem/billing/amazon libs/amazon*.jar libs/GoogleAd*.jar ../ActionBarSherlock ../tests ../build-utils && \
+        sed -i  '28d;s/AMAZON(AmazonBillingProvider.INSTANCE), //g' src/li/klass/fhem/billing/BillingService.java && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        echo "android.library.reference.2=$$MobAdMob$$" >> project.properties && \
+        sed -i '184,190d' AndroidManifest.xml
+
+Build:2.4.1,141
+    commit=34dce80f
+    subdir=app
+    srclibs=MobAdMob@2d5736;ActionBarSherlock@4.2.0
+    prebuild=rm -rf src/li/klass/fhem/billing/amazon libs/amazon*.jar libs/GoogleAd*.jar ../ActionBarSherlock ../tests ../build-utils && \
+        sed -i  '28d;s/AMAZON(AmazonBillingProvider.INSTANCE), //g' src/li/klass/fhem/billing/BillingService.java && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        echo "android.library.reference.2=$$MobAdMob$$" >> project.properties && \
+        sed -i '184,190d' AndroidManifest.xml
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.5.4
-Current Version Code:254
+# Not updating - proprietary dependencies
+Update Check Mode:Static
+Current Version:2.4.1
+Current Version Code:141
 
diff --git a/metadata/mancioboxblog.altervista.it.volumecontrol.txt b/metadata/mancioboxblog.altervista.it.volumecontrol.txt
index 4187e33a7b..f9728992f5 100644
--- a/metadata/mancioboxblog.altervista.it.volumecontrol.txt
+++ b/metadata/mancioboxblog.altervista.it.volumecontrol.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://mancioboxblog.altervista.org/
 Source Code:https://github.com/mancio/Volume-Control
diff --git a/metadata/me.cuelga.me.txt b/metadata/me.cuelga.me.txt
new file mode 100644
index 0000000000..589d9a35f3
--- /dev/null
+++ b/metadata/me.cuelga.me.txt
@@ -0,0 +1,24 @@
+Disabled:What does this app do?
+Categories:Games
+License:Apache2
+Web Site:
+Source Code:https://gitorious.org/cuelgame/cuelgame
+Issue Tracker:
+
+Auto Name:Cuelgame
+Summary:
+Description:
+Some description.
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/cuelgame/cuelgame.git
+
+Build Version:1.0,1,62e1b9a8eebe8a61,target=android-17,\
+prebuild=sed -i 's/android:debuggable="true"/android:debuggable="false"/' AndroidManifest.xml
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index bdeb28408e..0f46cf925b 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://code.google.com/p/osmtracker-android/
 Source Code:https://github.com/nguillaumin/osmtracker-android
-Issue Tracker:https://code.google.com/p/osmtracker-android/issues/list
+Issue Tracker:https://code.google.com/p/osmtracker-android/issues
 
 Name:OSMTracker
 Auto Name:OSMTracker for Android™
diff --git a/metadata/me.kuehle.carreport.txt b/metadata/me.kuehle.carreport.txt
index 1132f9c63d..1aae58a41b 100644
--- a/metadata/me.kuehle.carreport.txt
+++ b/metadata/me.kuehle.carreport.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:https://bitbucket.org/frigus02/car-report/
 Source Code:https://bitbucket.org/frigus02/car-report/src
diff --git a/metadata/me.malladi.dashcricket.txt b/metadata/me.malladi.dashcricket.txt
index e2ff09e82c..bf7ed1f03a 100644
--- a/metadata/me.malladi.dashcricket.txt
+++ b/metadata/me.malladi.dashcricket.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:Apache2
 Web Site:https://github.com/mvsastry
 Source Code:https://github.com/mvsastry/dashcricket
@@ -15,15 +15,29 @@ match scores from all around the world.
 Repo Type:git
 Repo:https://github.com/mvsastry/dashcricket.git
 
-Build Version:1.2,3,834d0d4717,srclibs=DashClock@v1.2,\
-extlibs=android/android-support-v4.jar,rm=libs/dashclock-api-r1.1.jar,prebuild=\
-echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties
-Build Version:1.3,4,d81191cf0ae590d,srclibs=DashClock@v1.2,\
-extlibs=android/android-support-v4.jar,rm=libs/dashclock-api-r1.1.jar,prebuild=\
-echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties
+Build:1.2,3
+    commit=834d0d4717
+    rm=libs/dashclock-api-r1.1.jar
+    extlibs=android/android-support-v4.jar
+    srclibs=DashClock@v1.2
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties
+
+Build:1.3,4
+    commit=d81191cf0ae590d
+    rm=libs/dashclock-api-r1.1.jar
+    extlibs=android/android-support-v4.jar
+    srclibs=DashClock@v1.2
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties
+
+Build:1.4,5
+    commit=678df3a6f
+    rm=libs/dashclock-api-r1.1.jar
+    extlibs=android/android-support-v4.jar
+    srclibs=DashClock@v1.2
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.3
-Current Version Code:4
+Current Version:1.4
+Current Version Code:5
 
diff --git a/metadata/mixedbit.speechtrainer.txt b/metadata/mixedbit.speechtrainer.txt
index acac035a03..fca4418c30 100644
--- a/metadata/mixedbit.speechtrainer.txt
+++ b/metadata/mixedbit.speechtrainer.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://mixedbit.org/
 Source Code:https://github.com/wrr/speech_trainer
@@ -19,8 +19,7 @@ Build Version:1.01,2,109eba6da3eac93c6e0d445f488433452387f815,subdir=app,target=
 Build Version:1.04,5,0a2507a168,subdir=app,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.04
 Current Version Code:5
 
diff --git a/metadata/mobi.cyann.nstools.txt b/metadata/mobi.cyann.nstools.txt
index efa7299ab5..c97bc9a505 100644
--- a/metadata/mobi.cyann.nstools.txt
+++ b/metadata/mobi.cyann.nstools.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://cyann.mobi/article/show/nstools
 Source Code:https://github.com/arifhn/nstools
@@ -13,11 +13,10 @@ Manage BLX,BLN,Deep Idle,Governor and voltage settings for custom kernels. Relev
 Repo Type:git
 Repo:https://github.com/arifhn/NSTools.git
 
-Build Version:1.16,20,caa8eec7,extlibs=android/android-support-v4.jar
+Build Version:1.16,20,v1.16,extlibs=android/android-support-v4.jar
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.16
 Current Version Code:20
 
diff --git a/metadata/mobi.omegacentauri.PerApp.txt b/metadata/mobi.omegacentauri.PerApp.txt
index 9936da2aa2..a3482cf505 100644
--- a/metadata/mobi.omegacentauri.PerApp.txt
+++ b/metadata/mobi.omegacentauri.PerApp.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:http://code.google.com/p/perapp/
-Source Code:http://code.google.com/p/perapp/source/checkout
-Issue Tracker:http://code.google.com/p/perapp/issues/list
+Source Code:http://code.google.com/p/perapp/source
+Issue Tracker:http://code.google.com/p/perapp/issues
 Donate:http://forum.xda-developers.com/donatetome.php?u=2714177
 
 Auto Name:PerApp
@@ -17,12 +17,12 @@ Repo:http://perapp.googlecode.com/svn/trunk/
 
 Build Version:0.12,14,22
 Build Version:1.02,19,30
-Build Version:1.03,20,!javacc complains (at 31)
+Build:1.03,20
+	commit=31
+	disable=missing layouts and views
 
 Auto Update Mode:None
-#Not in Market, yet
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.03
 Current Version Code:20
 
diff --git a/metadata/mobi.omegacentauri.SendReduced.txt b/metadata/mobi.omegacentauri.SendReduced.txt
index 6ab79850d6..b43c174635 100644
--- a/metadata/mobi.omegacentauri.SendReduced.txt
+++ b/metadata/mobi.omegacentauri.SendReduced.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:NewBSD
 Web Site:http://code.google.com/p/sendreduced/
-Source Code:http://code.google.com/p/sendreduced/source/list
-Issue Tracker:http://code.google.com/p/sendreduced/issues/list
+Source Code:http://code.google.com/p/sendreduced/source
+Issue Tracker:http://code.google.com/p/sendreduced/issues
 
 Auto Name:Send Reduced
 Summary:Reduce image size
@@ -15,12 +15,16 @@ messaging client.
 Repo Type:git-svn
 Repo:http://sendreduced.googlecode.com/svn/trunk/
 
-Build Version:0.03,3,4,target=android-16
-Build Version:0.04,4,5,target=android-16
+Build:0.03,3
+    commit=4
+    target=android-16
+
+Build:0.04,4
+    commit=5
+    target=android-16
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.05
 Current Version Code:5
 
diff --git a/metadata/mohammad.adib.roundr.txt b/metadata/mohammad.adib.roundr.txt
index c1f9be8135..5ec9eb4c69 100644
--- a/metadata/mohammad.adib.roundr.txt
+++ b/metadata/mohammad.adib.roundr.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://forum.xda-developers.com/showthread.php?t=2234079
 Source Code:https://github.com/MohammadAdib/RoundR
diff --git a/metadata/monakhv.android.samlib.txt b/metadata/monakhv.android.samlib.txt
new file mode 100644
index 0000000000..d766aa6e76
--- /dev/null
+++ b/metadata/monakhv.android.samlib.txt
@@ -0,0 +1,23 @@
+Categories:Reading
+License:Apache2
+Web Site:http://groups.google.com/group/samlib-info
+Source Code:https://github.com/monakhv/samlib-Info
+Issue Tracker:https://github.com/monakhv/samlib-Info/issues
+
+Auto Name:SamLib Инфо
+Summary:Track new Russian publications
+Description:
+New publications on samlib.ru site.
+.
+
+Repo Type:git
+Repo:https://github.com/monakhv/samlib-Info.git
+
+Build:3.1.9,19
+    commit=V3.1.9
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:3.1.9
+Current Version Code:19
+
diff --git a/metadata/name.bagi.levente.pedometer.txt b/metadata/name.bagi.levente.pedometer.txt
index 802210ae99..f2c8c6fc52 100644
--- a/metadata/name.bagi.levente.pedometer.txt
+++ b/metadata/name.bagi.levente.pedometer.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://code.google.com/p/pedometer/
 Source Code:https://github.com/bagilevi/android-pedometer
-Issue Tracker:https://code.google.com/p/pedometer/issues/list
+Issue Tracker:https://code.google.com/p/pedometer/issues
 
 Auto Name:Pedometer
 Summary:Measure your steps
@@ -16,8 +16,7 @@ Repo:https://github.com/bagilevi/android-pedometer.git
 Build Version:1.4.1,6,1.4.1
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.4.1
 Current Version Code:6
 
diff --git a/metadata/name.boyle.chris.sgtpuzzles.txt b/metadata/name.boyle.chris.sgtpuzzles.txt
index dd741aab15..088ef0152a 100644
--- a/metadata/name.boyle.chris.sgtpuzzles.txt
+++ b/metadata/name.boyle.chris.sgtpuzzles.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:MIT
 Web Site:http://chris.boyle.name/projects/android-puzzles
 Source Code:https://github.com/chrisboyle/sgtpuzzles
@@ -14,12 +14,21 @@ logic games.
 Repo Type:git
 Repo:git://github.com/chrisboyle/sgtpuzzles.git
 
+Build:9561.1,72
+    commit=9561.1
+    init=sed -i 's/android-8/android-15/g' build.properties
+    update=force
+    prebuild=echo -e 'APP_ABI=armeabi x86\nAPP_CFLAGS += -Wno-error=format-security' > jni/Application.mk && \
+             sed -i '261 i \\t\tpaint.setStyle(Paint.Style.FILL);' src/name/boyle/chris/sgtpuzzles/GameView.java
+    buildjni=yes
+
+Maintainer Notes:
+I've built binaries for x86 but haven't run it on a device; mips doesn't build with ndk-r9c
+One line sed patch is to fix issue #77; shouldn't be needed in next version
+.
+
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:9561.1
 Current Version Code:72
 
-#This doesn't build
-#Build Version:9411.2,70,bb35b1265f,buildjni=yes
-#Build Version:9561.2,72,9561.1,buildjni=yes
diff --git a/metadata/name.juodumas.ext_kbd_lithuanian.txt b/metadata/name.juodumas.ext_kbd_lithuanian.txt
new file mode 100644
index 0000000000..4c30fe1f06
--- /dev/null
+++ b/metadata/name.juodumas.ext_kbd_lithuanian.txt
@@ -0,0 +1,33 @@
+Categories:System
+License:Unlicense
+Web Site:
+Source Code:https://github.com/juodumas/android-lithuanian-layouts
+Issue Tracker:https://github.com/juodumas/android-lithuanian-layouts/issues
+
+Auto Name:Lithuanian Layouts - Ext. Keyboards
+Summary:Lithuanian for hardware keyboards
+Description:
+After installing the package, click on your hardware keyboard in 
+Android's input settings and choose one of the Lithuanian layouts.
+
+Summary in Lithuanian:
+Šis Android paketas prideda 2 lietuviškus klaviatūros išdėstymus išorinėms klaviatūroms:
+
+Lithuanian (numeric) - „skaičiukinė“ klaviatūra,
+Lithuanian (IBM LST 1205-92) - ĄŽERTY išdėstymas.
+Išbandyta su Android 4.1 ir 4.2 su USB ir Bluetooth klaviatūromis.
+.
+
+Repo Type:git
+Repo:https://github.com/juodumas/android-lithuanian-layouts.git
+
+Build:1.0,1
+    commit=34aa5
+    init=mkdir src
+    rm=built
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/name.livitski.games.puzzle.android.txt b/metadata/name.livitski.games.puzzle.android.txt
index b96bf3895c..8e18355fc0 100644
--- a/metadata/name.livitski.games.puzzle.android.txt
+++ b/metadata/name.livitski.games.puzzle.android.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 
 Web Site:http://www.livitski.name/projects/n-puzzle
diff --git a/metadata/name.soulayrol.rhaa.sholi.txt b/metadata/name.soulayrol.rhaa.sholi.txt
new file mode 100644
index 0000000000..c08fb526f0
--- /dev/null
+++ b/metadata/name.soulayrol.rhaa.sholi.txt
@@ -0,0 +1,37 @@
+Categories:Office
+License:GPLv3
+Web Site:https://github.com/dsoulayrol/android-sholi
+Source Code:https://github.com/dsoulayrol/android-sholi
+Issue Tracker:https://github.com/dsoulayrol/android-sholi/issues
+
+Auto Name:ShoLi
+Summary:Shopping lists manager
+Description:
+ShoLi aims at being a very simple tool to edit shopping lists, and
+then to be a support for checking on those very lists. It was heavily
+inspired by [[caldwell.ben.trolly]] which proposed a clean and
+efficient interface to achieve the same goal.
+
+ShoLi was only designed for small devices, the kind you can have in
+your pocket when you are doing your shopping. It runs on Android 4.x,
+and needs no external library, neither special permission.
+.
+
+Repo Type:git
+Repo:https://github.com/dsoulayrol/android-sholi.git
+
+Build:1.0,1
+    commit=v1.0
+    subdir=sholi
+    gradle=defaultFlavor
+
+Build:1.1,2
+    commit=v1.1
+    subdir=sholi
+    gradle=defaultFlavor
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/nerd.tuxmobil.fahrplan.congress.txt b/metadata/nerd.tuxmobil.fahrplan.congress.txt
new file mode 100644
index 0000000000..d044ca2c64
--- /dev/null
+++ b/metadata/nerd.tuxmobil.fahrplan.congress.txt
@@ -0,0 +1,43 @@
+Categories:Office
+License:Apache2
+Web Site:https://github.com/tuxmobil/CampFahrplan
+Source Code:https://github.com/tuxmobil/CampFahrplan
+Issue Tracker:https://github.com/tuxmobil/CampFahrplan/issues
+
+Auto Name:30C3 Schedule
+Summary:Schedule of the Chaos Communcation Events
+Description:
+CampFahrplan is a viewer for schedules of Chaos Computer Club e.V. events
+such as Chaos Communication Camp or Chaos Communication Congress.
+  
+In addition to an daily overview of talks, the app lets you read the abstracts,
+highlight talks, add a talk to your calendar, share talks with others,
+and set reminders within the app.
+.
+
+Repo Type:git
+Repo:https://github.com/tuxmobil/CampFahrplan.git
+
+Build:1.29.1,25
+    commit=4b8c037cc6d3f
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:1.29.3,27
+    commit=336a423a91
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:1.29.5,29
+    commit=285b15d1cc4c6
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.29.5
+Current Version Code:29
+
diff --git a/metadata/net.aangle.rvclock.txt b/metadata/net.aangle.rvclock.txt
index dcf37c3831..72cf690ec0 100644
--- a/metadata/net.aangle.rvclock.txt
+++ b/metadata/net.aangle.rvclock.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv3
 Web Site:http://android.acute-angle.net
 Source Code:https://bitbucket.org/uaraven/rvclock
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
index e66e27cd86..994d00dc17 100644
--- a/metadata/net.androgames.level.txt
+++ b/metadata/net.androgames.level.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://avianey.blogspot.com
 Source Code:https://github.com/avianey/Level
@@ -18,22 +18,24 @@ on a flat surface for a 360° level.
 * Roof pitch
 .
 
-#Repo Type:svn
-#Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
+# Repo Type:svn
+# Repo:http://androgames-sample.googlecode.com/svn/Market-apps/Level/trunk/
 Repo Type:git
 Repo:https://github.com/avianey/Level.git
 
-Build Version:1.8.0,27,75,update=force
-Build Version:1.9.0,29,79,update=force,target=android-11
-Build Version:1.9.2,31,81,target=android-11
-Build Version:1.9.3,32,84,target=android-11
-Build Version:1.9.4,33,a5e4dd671e,subdir=Level
+# Build Version:1.8.0,27,75,update=force
+# Build Version:1.9.0,29,79,update=force,target=android-11
+# Build Version:1.9.2,31,81,target=android-11
+# Build Version:1.9.3,32,84,target=android-11
+
+Build:1.9.4,33
+    commit=a5e4dd671e
+    subdir=Level
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.9.5
-Current Version Code:34
+Update Check Mode:RepoManifest
+Current Version:1.9.4
+Current Version Code:33
 
 No Source Since:1.9.5
 
diff --git a/metadata/net.androidcomics.acv.txt b/metadata/net.androidcomics.acv.txt
index c53a83694a..352557c06d 100644
--- a/metadata/net.androidcomics.acv.txt
+++ b/metadata/net.androidcomics.acv.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:Apache2
 Web Site:http://forums.droidcomicviewer.com
 Source Code:https://github.com/robotmedia/droid-comic-viewer
diff --git a/metadata/net.anzix.osm.upload.txt b/metadata/net.anzix.osm.upload.txt
index be05ce7fe5..8efc0f6e2a 100644
--- a/metadata/net.anzix.osm.upload.txt
+++ b/metadata/net.anzix.osm.upload.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:
 Source Code:https://github.com/elek/osmgpxuploader/
diff --git a/metadata/net.asceai.meritous.txt b/metadata/net.asceai.meritous.txt
index 77cd5e784b..b1c3f0a0f9 100644
--- a/metadata/net.asceai.meritous.txt
+++ b/metadata/net.asceai.meritous.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://asceai.net/meritous/
 Source Code:https://gitorious.org/meritous/
diff --git a/metadata/net.avs234.txt b/metadata/net.avs234.txt
index 0be9a51101..4d9683dc26 100644
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:LGPL
-Web Site:http://code.google.com/p/andless/
-Source Code:https://code.google.com/p/andless
-Issue Tracker:http://code.google.com/p/andless/issues/list
+Web Site:http://code.google.com/p/andless
+Source Code:https://code.google.com/p/andless/source
+Issue Tracker:http://code.google.com/p/andless/issues
 
 Auto Name:andLess
 Summary:Audio player
@@ -19,8 +19,7 @@ Repo:https://andless.googlecode.com/svn/trunk
 Build Version:1.3.5,16,96,target=android-17,scanignore=jni/Android/lib,buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.3.5
 Current Version Code:16
 
diff --git a/metadata/net.bible.android.activity.txt b/metadata/net.bible.android.activity.txt
index 7cced9f27e..74c8dd9563 100644
--- a/metadata/net.bible.android.activity.txt
+++ b/metadata/net.bible.android.activity.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:LGPL
 Web Site:http://code.google.com/p/and-bible/
 Source Code:https://github.com/mjdenham/and-bible
-Issue Tracker:https://code.google.com/p/and-bible/issues/list
+Issue Tracker:https://code.google.com/p/and-bible/issues
 
 Auto Name:And Bible
 Summary:Offline Bible reader
diff --git a/metadata/net.bluetoothviewer.txt b/metadata/net.bluetoothviewer.txt
new file mode 100644
index 0000000000..c0357a22d0
--- /dev/null
+++ b/metadata/net.bluetoothviewer.txt
@@ -0,0 +1,28 @@
+Categories:Development
+License:GPLv3
+Web Site:http://blog.ecomobilecitizen.com/android/bluetoothviewer
+Source Code:https://github.com/janosgyerik/bluetoothviewer
+Issue Tracker:https://github.com/janosgyerik/bluetoothviewer/issues
+Donate:https://github.com/janosgyerik/bluetoothviewer#Donations
+
+Auto Name:Bluetooth Viewer (LITE)
+Summary:Bluetooth connection debugging tool
+Description:
+* Connect to any Bluetooth device
+* Display incoming raw data
+* Send raw data to the Bluetooth device
+* You can confirm successful pairing, monitor incoming raw data and see exactly what is being transmitted from the Bluetooth device
+.
+
+Repo Type:git
+Repo:https://github.com/janosgyerik/bluetoothviewer.git
+
+Build:1.0.1,2
+    commit=04e06b866d0
+    rm=scripts;samples;graphics
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.1
+Current Version Code:2
+
diff --git a/metadata/net.bytten.xkcdviewer.txt b/metadata/net.bytten.xkcdviewer.txt
index 2e3d878cf3..9a82f34afb 100644
--- a/metadata/net.bytten.xkcdviewer.txt
+++ b/metadata/net.bytten.xkcdviewer.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv2+
 Web Site:http://bytten.net
 Source Code:https://github.com/tcoxon/XkcdViewer
diff --git a/metadata/net.cactii.mathdoku.txt b/metadata/net.cactii.mathdoku.txt
index 5713202d8f..31e0b67aee 100644
--- a/metadata/net.cactii.mathdoku.txt
+++ b/metadata/net.cactii.mathdoku.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/mathdoku/
-Source Code:http://code.google.com/p/mathdoku/source/checkout
-Issue Tracker:http://code.google.com/p/mathdoku/issues/list
+Source Code:http://code.google.com/p/mathdoku/source
+Issue Tracker:http://code.google.com/p/mathdoku/issues
 
 Auto Name:MathDoku
 Summary:Sudoku-like game based on KenKen
diff --git a/metadata/net.chilon.matt.teacup.txt b/metadata/net.chilon.matt.teacup.txt
index 6886209a5d..343f60aab2 100644
--- a/metadata/net.chilon.matt.teacup.txt
+++ b/metadata/net.chilon.matt.teacup.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/yourealwaysbe/teacup
 Source Code:https://github.com/yourealwaysbe/teacup
diff --git a/metadata/net.codechunk.speedofsound.txt b/metadata/net.codechunk.speedofsound.txt
index 6c1093e519..b59c627a3b 100644
--- a/metadata/net.codechunk.speedofsound.txt
+++ b/metadata/net.codechunk.speedofsound.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:https://github.com/jpeddicord/speedofsound
 Source Code:https://github.com/jpeddicord/speedofsound
diff --git a/metadata/net.cyclestreets.txt b/metadata/net.cyclestreets.txt
index 0361f8513c..ac974689c9 100644
--- a/metadata/net.cyclestreets.txt
+++ b/metadata/net.cyclestreets.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://www.cyclestreets.net/mobile/
 Source Code:https://github.com/cyclestreets/android
@@ -23,11 +23,20 @@ in advance of the journey
 Repo Type:git
 Repo:https://github.com/cyclestreets/android.git
 
-Build Version:1.5,11,RELEASE_1_5
-Build Version:2.0.1,15,RELEASE_2_0_1
+Build:1.5,11
+    commit=RELEASE_1_5
+
+Build:2.0.1,15
+    commit=RELEASE_2_0_1
+
+Build:2.1,17
+    disable=https://github.com/cyclestreets/android/issues/84
+    commit=RELEASE_2_1
+    subdir=cyclestreets
+    gradle=yes@..
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.0.1
-Current Version Code:15
+Current Version:2.1
+Current Version Code:17
 
diff --git a/metadata/net.czlee.debatekeeper.txt b/metadata/net.czlee.debatekeeper.txt
index 8fd87a3344..e1287a06f2 100644
--- a/metadata/net.czlee.debatekeeper.txt
+++ b/metadata/net.czlee.debatekeeper.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://tryingtoreason.wordpress.com/debatekeeper
 Source Code:https://github.com/czlee/debatekeeper
diff --git a/metadata/net.dahanne.android.regalandroid.txt b/metadata/net.dahanne.android.regalandroid.txt
index b89a3a3516..6d5282e21a 100644
--- a/metadata/net.dahanne.android.regalandroid.txt
+++ b/metadata/net.dahanne.android.regalandroid.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/regalandroid/
 Source Code:https://github.com/anthonydahanne/ReGalAndroid
-Issue Tracker:http://code.google.com/p/regalandroid/issues/list
+Issue Tracker:http://code.google.com/p/regalandroid/issues
 FlattrID:93967
 
 Auto Name:ReGalAndroid
diff --git a/metadata/net.dahanne.banq.notifications.txt b/metadata/net.dahanne.banq.notifications.txt
index 7b3a3cc7e6..b5337897f8 100644
--- a/metadata/net.dahanne.banq.notifications.txt
+++ b/metadata/net.dahanne.banq.notifications.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:
 Source Code:https://bitbucket.org/anthonydahanne/banqnotificationsproject
diff --git a/metadata/net.debian.debiandroid.txt b/metadata/net.debian.debiandroid.txt
new file mode 100644
index 0000000000..cb200d11a8
--- /dev/null
+++ b/metadata/net.debian.debiandroid.txt
@@ -0,0 +1,41 @@
+Categories:Science & Education,Development
+License:GPLv3+
+Web Site:https://github.com/uberspot/DebianDroid
+Source Code:https://github.com/uberspot/DebianDroid
+Issue Tracker:https://github.com/uberspot/DebianDroid/issues
+
+Auto Name:DebianDroid
+Summary:Tools for Debian project members
+Description:
+App for maintainers, uploaders or developers of the Debian community. It
+communicates with the Debian soap and rest api and retrieves information that
+can be useful when you're not in front of your workstation at home or at
+office.
+
+It eases a lot of operations like checking the next DInstall time, submitting
+a new bug report or responding to an existing one, getting info on packages
+and on pending bugs for those packages, etc. 
+.
+
+Repo Type:git
+Repo:https://github.com/uberspot/DebianDroid.git
+
+Build:1.7,12
+    commit=5708e25c80969e
+    submodules=yes
+    init=sed -i 's/StorageUtils/storageutils/g' project.properties 
+    extlibs=android/android-support-v4.jar
+    prebuild=mv libs/android-support-v4.jar external/actionbarsherlock/actionbarsherlock/libs/
+
+Build:1.72,13
+    commit=7b44b8019f2117
+    submodules=yes
+    init=sed -i 's/StorageUtils/storageutils/g' project.properties 
+    extlibs=android/android-support-v4.jar
+    prebuild=mv libs/android-support-v4.jar external/actionbarsherlock/actionbarsherlock/libs/
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.72
+Current Version Code:13
+
diff --git a/metadata/net.everythingandroid.smspopup.txt b/metadata/net.everythingandroid.smspopup.txt
index d5ad7c65ad..bd452714ec 100644
--- a/metadata/net.everythingandroid.smspopup.txt
+++ b/metadata/net.everythingandroid.smspopup.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://code.google.com/p/android-smspopup/
-Source Code:http://code.google.com/p/android-smspopup/source/checkout
-Issue Tracker:http://code.google.com/p/android-smspopup/issues/list
+Source Code:http://code.google.com/p/android-smspopup/source
+Issue Tracker:http://code.google.com/p/android-smspopup/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=smspopup+donations%40everythingandroid%2enet&item_name=Donate%20to%20SMSPopup
 
 Auto Name:SMS Popup
diff --git a/metadata/net.exclaimindustries.geohashdroid.txt b/metadata/net.exclaimindustries.geohashdroid.txt
index 25329d6b0d..82e75f6126 100644
--- a/metadata/net.exclaimindustries.geohashdroid.txt
+++ b/metadata/net.exclaimindustries.geohashdroid.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:NewBSD
 Web Site:https://code.google.com/p/geohashdroid/
-Source Code:https://code.google.com/p/geohashdroid/source/list
-Issue Tracker:https://code.google.com/p/geohashdroid/issues/list
+Source Code:https://code.google.com/p/geohashdroid/source
+Issue Tracker:https://code.google.com/p/geohashdroid/issues
 
 Auto Name:Geohash Droid
 Summary:Geohashing app
diff --git a/metadata/net.fercanet.LNM.txt b/metadata/net.fercanet.LNM.txt
index 6c3b2e8794..2e3e98682b 100644
--- a/metadata/net.fercanet.LNM.txt
+++ b/metadata/net.fercanet.LNM.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://learnmusicnotes.sourceforge.net/
 Source Code:http://sourceforge.net/projects/learnmusicnotes/develop
@@ -10,7 +10,7 @@ Description:
 A simple game to assist with music sight reading training.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://learnmusicnotes.svn.sourceforge.net/svnroot/learnmusicnotes/trunk
 
 Build Version:1.2,3,16
diff --git a/metadata/net.fred.feedex.txt b/metadata/net.fred.feedex.txt
index 3dfebaa840..47d9c4a1ae 100644
--- a/metadata/net.fred.feedex.txt
+++ b/metadata/net.fred.feedex.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 # see LICENSE
 License:GPLv3
 Web Site:
@@ -15,26 +15,98 @@ from the device on a regular basis.
 Repo Type:git
 Repo:https://github.com/HoloAddict/FeedEx.git
 
-Build Version:1.0.8,9,v1.0.8
-Build Version:1.0.9,10,v1.0.9
-Build Version:1.1.1,12,v1.1.1,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.1.2,13,v1.1.2,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.1.3,14,v1.1.3,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.1.4,15,v1.1.4,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.0,16,v1.2.0,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.1,17,v1.2.1,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.2,18,v1.2.2,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.3,19,v1.2.3,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.4,20,v1.2.4,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.5,21,v1.2.5,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.7,23,v1.2.7,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.2.8,24,v1.2.8,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.3.2,27,v1.3.2,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.3.3,28,v1.3.3,prebuild=sed -i -e '/proguard/d' project.properties
-Build Version:1.3.4,29,v1.3.4,prebuild=sed -i -e '/proguard/d' project.properties
+Build:1.0.8,9
+    commit=v1.0.8
+
+Build:1.0.9,10
+    commit=v1.0.9
+
+Build:1.1.1,12
+    commit=v1.1.1
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.1.2,13
+    commit=v1.1.2
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.1.3,14
+    commit=v1.1.3
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.1.4,15
+    commit=v1.1.4
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.0,16
+    commit=v1.2.0
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.1,17
+    commit=v1.2.1
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.2,18
+    commit=v1.2.2
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.3,19
+    commit=v1.2.3
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.4,20
+    commit=v1.2.4
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.5,21
+    commit=v1.2.5
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.7,23
+    commit=v1.2.7
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.2.8,24
+    commit=v1.2.8
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.2,27
+    commit=v1.3.2
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.3,28
+    commit=v1.3.3
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.4,29
+    commit=v1.3.4
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.5,30
+    commit=v1.3.5
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.6,31
+    commit=v1.3.6
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.7,32
+    commit=v1.3.7
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.3.8,33
+    commit=v1.3.8
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.4.0,34
+    commit=v1.4.0
+    prebuild=sed -i -e '/proguard/d' project.properties
+
+Build:1.4.1,35
+    commit=v1.4.1
+    prebuild=sed -i -e '/proguard/d' project.properties
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.3.4
-Current Version Code:29
+Current Version:1.4.1
+Current Version Code:35
 
diff --git a/metadata/net.gaast.giggity.txt b/metadata/net.gaast.giggity.txt
index 9279d0c8ef..6c19052f28 100644
--- a/metadata/net.gaast.giggity.txt
+++ b/metadata/net.gaast.giggity.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://wilmer.gaa.st/main.php/giggity.html
 Source Code:http://wilmer.gaa.st/main.php/giggity.html
diff --git a/metadata/net.georgewhiteside.android.abstractart.txt b/metadata/net.georgewhiteside.android.abstractart.txt
index 3a4cf29ed8..47aecb0211 100644
--- a/metadata/net.georgewhiteside.android.abstractart.txt
+++ b/metadata/net.georgewhiteside.android.abstractart.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv3
 Web Site:https://github.com/gwhiteside/abstract-art
 Source Code:https://github.com/gwhiteside/abstract-art
diff --git a/metadata/net.gorry.aicia.txt b/metadata/net.gorry.aicia.txt
index 704a560376..7d4511b51e 100644
--- a/metadata/net.gorry.aicia.txt
+++ b/metadata/net.gorry.aicia.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://gorry.haun.org/android/aicia/
 Source Code:https://bitbucket.org/dalb8/aicia
diff --git a/metadata/net.gorry.android.input.nicownng.txt b/metadata/net.gorry.android.input.nicownng.txt
index 00b02a3708..47a680e642 100644
--- a/metadata/net.gorry.android.input.nicownng.txt
+++ b/metadata/net.gorry.android.input.nicownng.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://gorry.haun.org/android/nicownng
 Source Code:https://bitbucket.org/dalb8/nicownng
diff --git a/metadata/net.healeys.lexic.txt b/metadata/net.healeys.lexic.txt
index d21346dd2a..3f9e1a837e 100644
--- a/metadata/net.healeys.lexic.txt
+++ b/metadata/net.healeys.lexic.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://lexic-games.com/
-Source Code:http://code.google.com/p/lexic/source/checkout
-Issue Tracker:http://code.google.com/p/lexic/issues/list
+Source Code:http://code.google.com/p/lexic/source
+Issue Tracker:http://code.google.com/p/lexic/issues
 
 Summary:Word Game
 Description:
diff --git a/metadata/net.i2p.android.router.txt b/metadata/net.i2p.android.router.txt
index 8d8abe003a..833bbf59cd 100644
--- a/metadata/net.i2p.android.router.txt
+++ b/metadata/net.i2p.android.router.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://i2p2.de
 Source Code:http://github.com/i2p
@@ -22,24 +22,51 @@ For detailed information, security information, and usage examples see the [Rele
 Repo Type:git
 Repo:https://github.com/i2p/i2p.android.base.git
 
-Build Version:0.9.7.1,0,!needs legacy toolchains e4c9095626cce668de33,\
-srclibs=I2P@06d2db0046efa1f5bd766,update=no,patch=jni.patch,novcheck=yes,prebuild=\
-    sed -i '41s|#export NDK=$(realpath ../../android-ndk-r5b/)|export NDK=$$NDK$$|' ./routerjars/jni/build.sh && \
-    cp -R $$I2P$$* ./i2p.i2p && \
-    echo -e "\nsdk.dir=$$SDK$$" >> ./local.properties && \
-    echo -e "\nsdk.dir=$$SDK$$" >> ./routerjars/local.properties && \
-    echo -e "\nndk.dir=$$NDK$$" >> ./routerjars/local.properties && \
-    echo -e "\ni2psrc=./i2p.i2p" >> ./local.properties && \
-    rm -R ./i2p.i2p/installer/lib/jbigi/* &&\
-    rm -R ./i2p.i2p/installer/lib/wrapper/* && \
-    rm -R ./routerjars/jni/libjbigi.so && \
-    cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
-    echo -e "\nandroid.library.reference.2=./appcompat/" >> ./local.properties && \
-    $$SDK$$/tools/android update lib-project --path ./appcompat/ && \
-    echo -e "\ni2psrc=./../i2p.i2p" >> ./routerjars/local.properties && \
-    wget ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 && \
-    tar xjvf gmp-4.* -C ./i2p.i2p/core/c/jbigi/ && \
-    rm ./gmp-4.*
+Build Version:0.9.8.1,4734976,788445f6ceb0d0c165e98b9b7d1aa732c98d37ac,\
+srclibs=I2P@d7c3ffa4def637f1c18dbd316f9e06093b113e09,update=no,patch=build.sh.patch,novcheck=yes,prebuild=\
+	sed -i '41s|#export NDK=$(realpath ../../android-ndk-r5b/)|export NDK=$$NDK$$|' ./routerjars/jni/build.sh && \
+	cp -R $$I2P$$* ./i2p.i2p && \
+	echo -e "\nsdk.dir=$$SDK$$" >> ./local.properties && \
+	echo -e "\nsdk.dir=$$SDK$$" >> ./routerjars/local.properties && \
+	echo -e "\nndk.dir=$$NDK$$" >> ./routerjars/local.properties && \
+	echo -e "\ni2psrc=./i2p.i2p" >> ./local.properties && \
+	rm -R ./i2p.i2p/installer/lib/jbigi/* &&\
+	rm -R ./i2p.i2p/installer/lib/wrapper/* && \
+	rm -R ./i2p.i2p/installer/lib/launch4j/bin* && \
+	rm -R ./i2p.i2p/installer/lib/launch4j/w32api* && \
+	rm -R ./routerjars/jni/libjbigi.so && \
+	cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
+	echo -e "\nandroid.library.reference.2=./appcompat/" >> ./local.properties && \
+	$$SDK$$/tools/android update lib-project --path ./appcompat/ && \
+	echo -e "\ni2psrc=./../i2p.i2p" >> ./routerjars/local.properties && \
+	wget ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 && \
+	tar xjvf gmp-4.* -C ./i2p.i2p/core/c/jbigi/ && \
+	rm ./gmp-4.*
+
+Build:0.9.9-0_b1-API8,4737024
+    commit=97037fe1d88342807ea3179c552a7c49c6ce426c
+    srclibs=I2P@f8a54bde19d7a6b87c5c192dd9a45950e739242a
+    update=no
+    prebuild=\
+        sed -i '41s|#export NDK=$(realpath ../../android-ndk-r5b/)|export NDK=$$NDK$$|' ./routerjars/jni/build.sh && \
+        sed -i '46,47d' ./routerjars/jni/build.sh && \
+        cp -R $$I2P$$* ./i2p.i2p && \
+        echo -e "\nsdk.dir=$$SDK$$" >> ./local.properties && \
+        echo -e "\nsdk.dir=$$SDK$$" >> ./routerjars/local.properties && \
+        echo -e "\nndk.dir=$$NDK$$" >> ./routerjars/local.properties && \
+        echo -e "\ni2psrc=./i2p.i2p" >> ./local.properties && \
+        rm -R ./i2p.i2p/installer/lib/jbigi/* &&\
+        rm -R ./i2p.i2p/installer/lib/wrapper/* && \
+        rm -R ./i2p.i2p/installer/lib/launch4j/bin* && \
+        rm -R ./i2p.i2p/installer/lib/launch4j/w32api* && \
+        rm -R ./routerjars/jni/libjbigi.so && \
+        cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
+        echo -e "\nandroid.library.reference.2=./appcompat/" >> ./local.properties && \
+        $$SDK$$/tools/android update lib-project --path ./appcompat/ && \
+        echo -e "\ni2psrc=./../i2p.i2p" >> ./routerjars/local.properties && \
+        wget ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 && \
+        tar xjvf gmp-4.* -C ./i2p.i2p/core/c/jbigi/ && \
+        rm ./gmp-4.*
 
 # Android version code is an integer. So we have 31 bits.
 # MAJOR         4 bits 0-15
@@ -50,5 +77,5 @@ srclibs=I2P@06d2db0046efa1f5bd766,update=no,patch=jni.patch,novcheck=yes,prebuil
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.9.7.1
-Current Version Code:0
+Current Version:0.9.9
+Current Version Code:4737024
diff --git a/metadata/net.i2p.android.router/build.sh.patch b/metadata/net.i2p.android.router/build.sh.patch
new file mode 100644
index 0000000000..1baa44be26
--- /dev/null
+++ b/metadata/net.i2p.android.router/build.sh.patch
@@ -0,0 +1,56 @@
+*** a/routerjars/jni/build.sh	2013-10-28 19:34:32.790844250 +0100
+--- b/routerjars/jni/build.sh	2013-10-28 19:35:39.906841258 +0100
+***************
+*** 41,51 ****
+  #export NDK=$(realpath ../../android-ndk-r5b/)
+  
+  ## Simple fix for osx development
+! if [ "`uname -s`" == "Darwin" ]; then
+!     export NDK=/Developer/android/ndk/
+! else
+!     export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
+! fi
+  #
+  # API level, must match that in ../AndroidManifest.xml
+  #
+--- 41,51 ----
+  #export NDK=$(realpath ../../android-ndk-r5b/)
+  
+  ## Simple fix for osx development
+! #if [ "`uname -s`" == "Darwin" ]; then
+! #    export NDK=/Developer/android/ndk/
+! #else
+! #    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
+! #fi
+  #
+  # API level, must match that in ../AndroidManifest.xml
+  #
+***************
+*** 53,63 ****
+  ARCH=arm
+  export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
+  export AABI=arm-linux-androideabi-4.4.3
+! if [ "`uname -s`" == "Darwin" ]; then
+!     export SYSTEM=darwin-x86
+! else
+!     export SYSTEM=linux-x86
+! fi
+  export BINPREFIX=arm-linux-androideabi-
+  export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT"
+  # worked without this on 4.3.2, but 5.0.2 couldn't find it
+--- 53,67 ----
+  ARCH=arm
+  export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
+  export AABI=arm-linux-androideabi-4.4.3
+! if [ "`uname -s`" == "Darwin" ]
+! 	then
+! 		export SYSTEM=darwin-x86
+! 	elif [ "`uname -m`" == "x86_64" ]
+! 	then
+! 		export SYSTEM=linux-x86_64
+! 	else
+! 		export SYSTEM=linux-x86
+! fi 
+  export BINPREFIX=arm-linux-androideabi-
+  export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT"
+  # worked without this on 4.3.2, but 5.0.2 couldn't find it
diff --git a/metadata/net.i2p.android.router/jni.patch b/metadata/net.i2p.android.router/jni.patch
deleted file mode 100644
index 10202a7dac..0000000000
--- a/metadata/net.i2p.android.router/jni.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/routerjars/jni/build.sh2013-09-19 12:51:29.865886937 +0200
-+++ b/routerjars/jni/build.sh	2013-09-19 12:51:20.755000838 +0200
-@@ -41,14 +41,14 @@
- #export NDK=$(realpath ../../android-ndk-r5b/)
- 
- ## Simple fix for osx development
--if [ "`uname -s`" == "Darwin" ]; then
--    export NDK=/Developer/android/ndk/
--else
--    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
--fi
-+#if [ "`uname -s`" == "Darwin" ]; then
-+#    export NDK=/Developer/android/ndk/
-+#else
-+#    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
-+#fi
- #
- # API level, must match that in ../AndroidManifest.xml
- #
- LEVEL=8
- ARCH=arm
- export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
diff --git a/metadata/net.imatruck.betterweather.txt b/metadata/net.imatruck.betterweather.txt
new file mode 100644
index 0000000000..156d1c0a3b
--- /dev/null
+++ b/metadata/net.imatruck.betterweather.txt
@@ -0,0 +1,42 @@
+Categories:Wallpaper
+License:Apache2
+Web Site:
+Source Code:https://github.com/MarcDufresne/BetterWeather
+Issue Tracker:https://github.com/MarcDufresne/BetterWeather/issues
+
+Auto Name:BetterWeather
+Summary:DashClock extension
+Description:
+Based on the weather extension included with [[net.nurik.roman.dashclock]].
+It also contains more weather status icons than the original extension 
+(Thunderstorms, Mostly Cloudy, Hail, etc.) and 
+multiple icon themes (Climacons, Weathercons and Chameleon icon packs).
+
+Full feature list includes:
+* Manual or automatic location;
+* Refresh on touch;
+* Custom shortcut on touch;
+* Forecasts;
+* Wind speed and wind chill;
+* Humidity level;
+* Lots of icons
+.
+
+Repo Type:git
+Repo:https://github.com/MarcDufresne/BetterWeather.git
+
+Build:2.2.2,34
+    commit=ba20a05e3506fb
+    subdir=betterweather
+    gradle=yes
+
+Build:2.3,35
+    commit=d4ee5cc38e6a972
+    subdir=betterweather
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.3
+Current Version Code:35
+
diff --git a/metadata/net.inclem.nogo.txt b/metadata/net.inclem.nogo.txt
new file mode 100644
index 0000000000..f98856f84c
--- /dev/null
+++ b/metadata/net.inclem.nogo.txt
@@ -0,0 +1,26 @@
+Categories:Games
+License:GPLv3
+Web Site:https://github.com/inclement/noGo
+Source Code:https://github.com/inclement/noGo
+Issue Tracker:https://github.com/inclement/noGo/issues
+
+Summary:SGF Viewer/Editor
+Description:
+noGo is an SGF viewer and editor. It includes ~1100 games covering mostly
+Japanese title matches over the last few decades, from Andries Brouwer's
+[http://homepages.cwi.nl/~aeb/go/games/index.html public domain collection].
+.
+
+Repo Type:git
+Repo:https://github.com/inclement/noGo.git
+
+Build:0.4.2,99999999
+    disable=wip - kivy support not yet complete/tested (also requires kombilo which seems unavailable)
+    commit=v0.4.2
+    kivy=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.4.2
+Current Version Code:99999999
+
diff --git a/metadata/net.iowaline.dotdash.txt b/metadata/net.iowaline.dotdash.txt
index 272416d5a0..0206bb98aa 100644
--- a/metadata/net.iowaline.dotdash.txt
+++ b/metadata/net.iowaline.dotdash.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/dotdash-keyboard-android/
-Source Code:http://code.google.com/p/dotdash-keyboard-android/source/checkout
-Issue Tracker:http://code.google.com/p/dotdash-keyboard-android/issues/list
+Source Code:http://code.google.com/p/dotdash-keyboard-android/source
+Issue Tracker:http://code.google.com/p/dotdash-keyboard-android/issues
 
 Auto Name:DotDash Keyboard
 Summary:Morse code keyboard
diff --git a/metadata/net.jaqpot.netcounter.txt b/metadata/net.jaqpot.netcounter.txt
index b7b6cad0d3..2d2759e7fa 100644
--- a/metadata/net.jaqpot.netcounter.txt
+++ b/metadata/net.jaqpot.netcounter.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://www.jaqpot.net/netcounter/
 Source Code:http://www.jaqpot.net/netcounter/
@@ -15,8 +15,9 @@ limit.
 Repo Type:git-svn
 Repo:http://www.jaqpot.net/svn/android/netcounter/trunk
 
+Build Version:0.14.1,22,153,fixapos=yes,target=android-4
+
 Auto Update Mode:None
-#Build Version:0.14.1,22,!wait for client 153,fixapos=yes,target=android-4
 Update Check Mode:Static
 Current Version:0.14.1
 Current Version Code:22
diff --git a/metadata/net.jjc1138.android.scrobbler.txt b/metadata/net.jjc1138.android.scrobbler.txt
index f7f4912617..cf202363ad 100644
--- a/metadata/net.jjc1138.android.scrobbler.txt
+++ b/metadata/net.jjc1138.android.scrobbler.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:http://code.google.com/p/scrobbledroid/
-Source Code:http://code.google.com/p/scrobbledroid/source/list
-Issue Tracker:http://code.google.com/p/scrobbledroid/issues/list
+Source Code:http://code.google.com/p/scrobbledroid/source
+Issue Tracker:http://code.google.com/p/scrobbledroid/issues
 
 Auto Name:Scrobble Droid
 Summary:Keep track of what you listen to
@@ -20,8 +20,7 @@ wget https://raw.github.com/CyanogenMod/android_packages_apps_Music/366ed000b36c
 b21ecb03a08da6fc/src/com/android/music/IMediaPlaybackService.aidl -P src/com/android/music
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.6
 Current Version Code:7
 
diff --git a/metadata/net.kervala.comicsreader.txt b/metadata/net.kervala.comicsreader.txt
index 92100ce4ae..3b8429c2ad 100644
--- a/metadata/net.kervala.comicsreader.txt
+++ b/metadata/net.kervala.comicsreader.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://code.google.com/p/android-comicsreader/
-Source Code:http://code.google.com/p/android-comicsreader/source/list
-Issue Tracker:http://code.google.com/p/android-comicsreader/issues/list
+Source Code:http://code.google.com/p/android-comicsreader/source
+Issue Tracker:http://code.google.com/p/android-comicsreader/issues
 
 Auto Name:Comics Reader
 Summary:Comic and image viewer
@@ -22,22 +22,51 @@ Description:
 Repo Type:hg
 Repo:https://code.google.com/p/android-comicsreader/
 
-Build Version:1.0,2,!7ecb0e,buildjni=yes
-Build Version:1.0.554,11,!No source code published
+Build:1.0,2
+    disable=7ecb0e
+    commit=unknown - see disabled
+    buildjni=yes
+
+Build:1.0.554,11
+    disable=No source code published
+    commit=unknown - see disabled
+
 #Strings.xml not updated; get version from downloads section
-Build Version:1.0.566,12,!6fc1154e7964,buildjni=yes,forceversion=yes
-Build Version:1.0.576,13,!a1f5b72b82f3,buildjni=yes,forceversion=yes
-Build Version:1.1.612,15,555d0d6ed6bb,forceversion=yes,patch=unrar.patch,prebuild=\
-rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java,buildjni=no
-Build Version:1.1.624,17,40,\
-forceversion=yes,\
-patch=unrar_17.patch,\
-prebuild=rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java,\
-buildjni=no
+Build:1.0.566,12
+    disable=6fc1154e7964
+    commit=unknown - see disabled
+    forceversion=yes
+    buildjni=yes
+
+Build:1.0.576,13
+    disable=a1f5b72b82f3
+    commit=unknown - see disabled
+    forceversion=yes
+    buildjni=yes
+
+Build:1.1.612,15
+    commit=555d0d6ed6bb
+    forceversion=yes
+    patch=unrar.patch
+    prebuild=rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java
+    buildjni=no
+
+Build:1.1.624,17
+    commit=6650f062edf6
+    forceversion=yes
+    patch=unrar_17.patch
+    prebuild=rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java
+    buildjni=no
+
+Build:1.2,18
+    disable=AM.xml syntax errors
+    commit=4af3b30af2a6
+    patch=unrar_18.patch
+    prebuild=rm -rf jni/ src/net/kervala/CbrAlbum.java src/net/kervala/RarFile.java
+    buildjni=no
 
 Auto Update Mode:None
-# CV is inaccurate; also on gplay and downloads page 
 Update Check Mode:RepoManifest
-Current Version:1.1
-Current Version Code:17
+Current Version:1.2
+Current Version Code:18
 
diff --git a/metadata/net.kervala.comicsreader/unrar_18.patch b/metadata/net.kervala.comicsreader/unrar_18.patch
new file mode 100644
index 0000000000..96fb32eb2b
--- /dev/null
+++ b/metadata/net.kervala.comicsreader/unrar_18.patch
@@ -0,0 +1,92 @@
+diff -r 4af3b30af2a6 src/net/kervala/comicsreader/Album.java
+--- a/src/net/kervala/comicsreader/Album.java	Fri Dec 27 16:48:15 2013 +0100
++++ b/src/net/kervala/comicsreader/Album.java	Wed Jan 01 19:43:24 2014 +0100
+@@ -56,7 +56,6 @@
+ 
+ 	static final int ALBUM_TYPE_NONE = 0;
+ 	static final int ALBUM_TYPE_CBZ = 1;
+-	static final int ALBUM_TYPE_CBR = 2;
+ 	static final int ALBUM_TYPE_CBT = 3;
+ 	static final int ALBUM_TYPE_FOLDER = 4;
+ 
+@@ -76,10 +75,6 @@
+ 			return new CbzAlbum();
+ 		}
+ 
+-		if (RarFile.isLoaded() && CbrAlbum.isValid(filename)) {
+-			return new CbrAlbum();
+-		}
+-
+ 		if (CbtAlbum.isValid(filename)) {
+ 			return new CbtAlbum();
+ 		}
+@@ -113,11 +108,6 @@
+ 			return ALBUM_TYPE_CBZ;
+ 		}
+ 
+-		// file is a cbr
+-		if (RarFile.isLoaded() && CbrAlbum.isValid(filename)) {
+-			return ALBUM_TYPE_CBR;
+-		}
+-
+ 		// file is a cbt
+ 		if (CbtAlbum.isValid(filename)) {
+ 			return ALBUM_TYPE_CBT;
+@@ -138,7 +128,6 @@
+ 		switch(getType(uriString))
+ 		{
+ 			case ALBUM_TYPE_CBZ: return CbzAlbum.getMimeType(filename);
+-			case ALBUM_TYPE_CBR: return CbrAlbum.getMimeType(filename);
+ 			case ALBUM_TYPE_CBT: return CbtAlbum.getMimeType(filename);
+ 			case ALBUM_TYPE_FOLDER: return FolderAlbum.getMimeType(filename);
+ 			default: break;
+@@ -161,9 +150,6 @@
+ 		// file is a cbz
+ 		if (CbzAlbum.isValid(filename)) return true;
+ 
+-		// file is a cbr
+-		if (RarFile.isLoaded() && CbrAlbum.isValid(filename)) return true;
+-
+ 		// file is a cbt
+ 		if (CbtAlbum.isValid(filename)) return true;
+ 
+@@ -187,9 +173,6 @@
+ 		// file is a cbz
+ 		if (CbzAlbum.isValid(filename)) return true;
+ 
+-		// file is a cbr
+-		if (RarFile.isLoaded() && CbrAlbum.isValid(filename)) return true;
+-
+ 		// file is a cbt
+ 		if (CbtAlbum.isValid(filename)) return true;
+ 
+@@ -203,9 +186,6 @@
+ 		// file is a cbz
+ 		if (CbzAlbum.askConfirm(filename)) return true;
+ 
+-		// file is a cbr
+-		if (RarFile.isLoaded() && CbrAlbum.askConfirm(filename)) return true;
+-
+ 		// file is a cbt
+ 		if (CbtAlbum.askConfirm(filename)) return true;
+ 
+@@ -219,7 +199,6 @@
+ 		switch(getType(filename))
+ 		{
+ 			case ALBUM_TYPE_CBZ: return CbzAlbum.getTitle(filename);
+-			case ALBUM_TYPE_CBR: return CbrAlbum.getTitle(filename);
+ 			case ALBUM_TYPE_CBT: return CbtAlbum.getTitle(filename);
+ 			case ALBUM_TYPE_FOLDER: return FolderAlbum.getTitle(filename);
+ 			default: break;
+diff -r 4af3b30af2a6 src/net/kervala/comicsreader/FolderAlbum.java
+--- a/src/net/kervala/comicsreader/FolderAlbum.java	Fri Dec 27 16:48:15 2013 +0100
++++ b/src/net/kervala/comicsreader/FolderAlbum.java	Wed Jan 01 19:43:24 2014 +0100
+@@ -54,7 +54,7 @@
+ 			// build a full absolute path
+ 			filename = f.getAbsolutePath();  
+ 
+-			return CbzAlbum.isValid(filename) || CbrAlbum.isValid(filename) || CbtAlbum.isValid(filename) || f.isDirectory();
++			return CbzAlbum.isValid(filename) || CbtAlbum.isValid(filename) || f.isDirectory();
+ 		}
+ 	}
+ 	
diff --git a/metadata/net.lardcave.keepassnfc.txt b/metadata/net.lardcave.keepassnfc.txt
new file mode 100644
index 0000000000..caf5309e16
--- /dev/null
+++ b/metadata/net.lardcave.keepassnfc.txt
@@ -0,0 +1,23 @@
+Categories:System
+License:Unlicense/Apache2
+Web Site:http://code.lardcave.net/entries/2013/04/01/215058
+Source Code:https://github.com/nfd/KeePassNFC
+Issue Tracker:https://github.com/nfd/KeePassNFC/issues
+
+Auto Name:KeePass NFC
+Summary:Unlock database with tags
+Description:
+For use with [[com.android.keepass]].
+.
+
+Repo Type:git
+Repo:https://github.com/nfd/KeePassNFC.git
+
+Build:1.0,1
+    commit=661a6f7
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/net.logomancy.dashquotes.civ5.txt b/metadata/net.logomancy.dashquotes.civ5.txt
new file mode 100644
index 0000000000..aa3d3a4c33
--- /dev/null
+++ b/metadata/net.logomancy.dashquotes.civ5.txt
@@ -0,0 +1,25 @@
+Category:Wallpaper
+License:GPLv3
+Source Code:https://github.com/logomancer/dashquotes-civ5
+Issue Tracker:https://github.com/logomancer/dashquotes-civ5/issues
+
+Name:DashClock: Civilization V Quotes
+Summary:Random quotes on lock screen
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/logomancer/dashquotes-civ5.git
+
+Build Version:1.0,1,d700ca6a87,\
+rm=libs/dashclock-api-r2.0.jar,\
+srclibs=DashClock@ecb5a191880,\
+prebuild=\
+  echo 'source.dir=src;$$DashClock$$/api/src/main/java;\
+    $$DashClock$$/api/src/main/aidl' >> project.properties
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/net.logomancy.diedroid.txt b/metadata/net.logomancy.diedroid.txt
index f8fcf430d7..20e3d082bf 100644
--- a/metadata/net.logomancy.diedroid.txt
+++ b/metadata/net.logomancy.diedroid.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/diedroid
-Source Code:http://code.google.com/p/diedroid/source/checkout
-Issue Tracker:http://code.google.com/p/diedroid/issues/list
+Source Code:http://code.google.com/p/diedroid/source
+Issue Tracker:http://code.google.com/p/diedroid/issues
 
 Auto Name:DieDroid
 Summary:Dice roller
diff --git a/metadata/net.luniks.android.inetify.txt b/metadata/net.luniks.android.inetify.txt
index a2ff2a15e4..d293705c9c 100644
--- a/metadata/net.luniks.android.inetify.txt
+++ b/metadata/net.luniks.android.inetify.txt
@@ -1,10 +1,8 @@
-#NonFreeDep can be removed with the Manifest patch below
-AntiFeatures:NonFreeDep
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://code.google.com/p/inetify/
-Source Code:http://code.google.com/p/inetify/source/checkout
-Issue Tracker:http://code.google.com/p/inetify/issues/list
+Source Code:http://code.google.com/p/inetify/source
+Issue Tracker:http://code.google.com/p/inetify/issues
 
 Auto Name:Inetify
 Summary:WiFi Internet access helper
@@ -16,27 +14,25 @@ otherwise: this is
 experimental and will use GPS when necessary, thus draining the battery
 
 '''N.B''' It isn't possible to view your position on a map because Google Maps
-is the only map source and
-f-droid can't supply an API key to use it. If you need to use Google Maps
-install the developer's build from the website.	
-
-Anti-feature: Dependencies. It's necessary for Google Maps to be already
-installed either as an app or as a shared system library for this app to be
-installable. We will be able to remove this dependency soon.
+is the only map source and f-droid can't supply an API key to use it. If you
+need to use Google Maps install the developer's build from the website.	
 .
 
 Repo Type:git-svn
-Repo:http://inetify.googlecode.com/svn/trunk/
+Repo:http://inetify.googlecode.com/svn/trunk/inetify/inetify-app
 
-Build Version:2.0.3,16,311,subdir=inetify/inetify-app,update=force,extlibs=android/android-support-v4.jar
+Build:2.0.3,16
+    commit=311
+    subdir=inetify/inetify-app
+    update=force
+    extlibs=android/android-support-v4.jar
+
+Build:2.1.0,18
+    commit=320
+	target=android-10
 
 Auto Update Mode:None
-#Attempting to view the map if you don't have Google maps installed, will cause the app to crash
-#Build Version:2.0.3,16,311,subdir=inetify/inetify-app,\
-#update=force,extlibs=android/android-support-v4.jar,prebuild=\
-#sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.0.3
-Current Version Code:16
+Update Check Mode:RepoManifest
+Current Version:2.1.0
+Current Version Code:18
 
diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt
index 18ba06ad84..abc5450868 100644
--- a/metadata/net.mafro.android.wakeonlan.txt
+++ b/metadata/net.mafro.android.wakeonlan.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:http://android.mafro.net/wol_tutorial.htm
 Source Code:https://github.com/mafrosis/Wake-On-Lan
@@ -18,8 +18,7 @@ Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42,prebuild=rm -rf
 Build Version:1.5,13,0f21d8beec740b823a45927df36f6c55dca526ad,prebuild=rm -rf releases/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:13
 
diff --git a/metadata/net.majorkernelpanic.spydroid.txt b/metadata/net.majorkernelpanic.spydroid.txt
new file mode 100644
index 0000000000..e75841e750
--- /dev/null
+++ b/metadata/net.majorkernelpanic.spydroid.txt
@@ -0,0 +1,46 @@
+AntiFeatures:UpstreamNonFree
+Category:Multimedia
+License:GPLv3
+Web Site:http://code.google.com/p/spydroid-ipcamera
+Source Code:http://code.google.com/p/spydroid-ipcamera/source
+Issue Tracker:http://code.google.com/p/spydroid-ipcamera/issues
+
+Auto Name:Spydroid
+Summary:Stream camera to desktop
+Description:
+*The stream can be directly read by VLC
+*You can enable/disable sound or video streaming
+*The resolution, the bitrate and the framerate of the stream can be configured
+*The flash can be controlled remotly !
+*You can choose between the back facing camera and the front facing camera 
+*You can make the phone vibrate remotely
+*You can see the battery level of the phone
+
+Requirements:
+*Gingerbread or better (API level >=9)
+*H.263: should work on phones that supports h263
+*H.264: should work on phones that supports h264
+*AMR: should work everywhere !
+*AAC: requires API level >=14
+
+Proprietary Google libraries removed in all but v4.2.
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/spydroid-ipcamera
+
+Build Version:4.2,420,4.2,forceversion=yes
+Build Version:6.9,690,6.9,\
+rm=libs/GoogleAdMobAdsSdk-6.1.0.jar,\
+srclibs=MobAdMob@2d5736,\
+prebuild=echo 'source.dir=src;$$MobAdMob$$/src' > ant.properties
+Build Version:9.1,910,9405ef5e4348,\
+rm=libs/GoogleAdMobAdsSdk-6.1.0.jar,\
+srclibs=MobAdMob@2d5736,\
+prebuild=echo 'source.dir=src;$$MobAdMob$$/src' > ant.properties
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:9.1
+Current Version Code:910
+
diff --git a/metadata/net.micode.compass.txt b/metadata/net.micode.compass.txt
index 9d62b2a752..ea450598f3 100644
--- a/metadata/net.micode.compass.txt
+++ b/metadata/net.micode.compass.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://www.micode.net
 Source Code:https://github.com/MiCode/Compass
diff --git a/metadata/net.micode.fileexplorer.txt b/metadata/net.micode.fileexplorer.txt
index f53d570b2a..5372f616e2 100644
--- a/metadata/net.micode.fileexplorer.txt
+++ b/metadata/net.micode.fileexplorer.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:AGPL
 Web Site:http://micode.net
 Source Code:https://github.com/MiCode/FileExplorer
diff --git a/metadata/net.micode.soundrecorder.txt b/metadata/net.micode.soundrecorder.txt
index e231465636..bc5c8cf569 100644
--- a/metadata/net.micode.soundrecorder.txt
+++ b/metadata/net.micode.soundrecorder.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/MiCode/SoundRecorder
 Source Code:https://github.com/MiCode/SoundRecorder
diff --git a/metadata/net.momodalo.app.vimtouch.txt b/metadata/net.momodalo.app.vimtouch.txt
index 19926b5e41..349003f903 100644
--- a/metadata/net.momodalo.app.vimtouch.txt
+++ b/metadata/net.momodalo.app.vimtouch.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:GPLv3
 Web Site:https://github.com/momodalo/vimtouch
 Source Code:https://github.com/momodalo/vimtouch
diff --git a/metadata/net.nightwhistler.pageturner.txt b/metadata/net.nightwhistler.pageturner.txt
index 6e65cafa4c..12d4f537ae 100644
--- a/metadata/net.nightwhistler.pageturner.txt
+++ b/metadata/net.nightwhistler.pageturner.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://pageturner-reader.org/
 Source Code:https://github.com/NightWhistler/PageTurner
@@ -28,28 +28,62 @@ Description:
 Repo Type:git
 Repo:https://github.com/NightWhistler/PageTurner.git
 
-Build Version:0.2.14_dev,1,dadd9b4eb0f4ca272e7e86c3e06dd47993755696,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
-Build Version:1.0,2,59a4d5ceca218973105bb3923d02dda72a45fbdd,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
-Build Version:1.0.1,3,d29570f185d585d3eaf83ebf8b9e78928f36ad2e,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
-Build Version:1.1.2,6,1.1.2,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
-Build Version:1.2.1,8,d7a087618ba4390d8f154da656cc26ad92d2354c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
-Build Version:1.3.4,14,6d28de0b2c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
+Build:0.2.14_dev,1
+    commit=dadd9b4eb0f4ca272e7e86c3e06dd47993755696
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
+
+Build:1.0,2
+    commit=59a4d5ceca218973105bb3923d02dda72a45fbdd
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
+
+Build:1.0.1,3
+    commit=d29570f185d585d3eaf83ebf8b9e78928f36ad2e
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
+
+Build:1.1.2,6
+    commit=1.1.2
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
+
+Build:1.2.1,8
+    commit=d7a087618ba4390d8f154da656cc26ad92d2354c
+    target=android-15
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar
+    srclibs=ActionBarNW@1a98f283
+    prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties
+
+Build:1.3.4,14
+    commit=6d28de0b2c
+    target=android-15
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar
+    srclibs=ActionBarNW@1a98f283
+    prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties
+
 #Can use maven (uses author's repo) but apk can't be found
-Build Version:2.0.7,24,2.0.7,srclibs=ActionBarSherlock@4.2.0,extlibs=guice/guice-2.0-no_aop.jar;\
-roboguice/roboguice-2.0.jar;epublib/epublib-core-3.1.jar;acra/acra-4.2.3.jar;\
-sl4j/slf4j-android-1.6.1-RC1.jar;findbugs/jsr305-1.3.2.jar;\
-htmlcleaner/htmlcleaner-2.2.jar;roboguice-sherlock/roboguice-sherlock-1.5.jar,\
-prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-git clone https://github.com/NightWhistler/HtmlSpanner && mvn package -f HtmlSpanner/pom.xml && \
-mv HtmlSpanner/target/htmlspanner-0.3-SNAPSHOT.jar libs/,target=android-15
-Build Version:2.0.8,25,2.0.8,maven=yes,bindir=target
-Build Version:2.0.9,26,!build fails at 2.0.9,maven=yes,bindir=target
-Build Version:2.0.10,27,!build fails with various missing symbols at 2.0.10,maven=yes,bindir=target
-Build Version:2.0.11,28,!missing artifacts -see build log at 2.0.11,maven=yes,bindir=target
-Build Version:2.1.4,37,2.1.4,maven=yes
+Build:2.0.7,24
+    commit=2.0.7
+    target=android-15
+    extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-2.0.jar;epublib/epublib-core-3.1.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;findbugs/jsr305-1.3.2.jar;htmlcleaner/htmlcleaner-2.2.jar;roboguice-sherlock/roboguice-sherlock-1.5.jar
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        git clone https://github.com/NightWhistler/HtmlSpanner && \
+        mvn package -f HtmlSpanner/pom.xml && \
+        mv HtmlSpanner/target/htmlspanner-0.3-SNAPSHOT.jar libs/
+
+Build:2.0.8,25
+    commit=2.0.8
+    maven=yes
+    bindir=target
+
+Build:2.2.1,56
+    commit=2.2.1
+    maven=yes
+
+Build:2.2.3,58
+    commit=2.2.3
+    maven=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.1.4
-Current Version Code:37
+Current Version:2.2.5
+Current Version Code:60
 
diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt
index f68a0b9b70..de3b14465b 100644
--- a/metadata/net.nurik.roman.dashclock.txt
+++ b/metadata/net.nurik.roman.dashclock.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:http://code.google.com/p/dashclock
-Source Code:http://code.google.com/p/dashclock/source/list
-Issue Tracker:http://code.google.com/p/dashclock/issues/list
+Source Code:http://code.google.com/p/dashclock/source
+Issue Tracker:http://code.google.com/p/dashclock/issues
 
 Auto Name:DashClock Widget
 Summary:Extensible lock screen widget
diff --git a/metadata/net.oschina.app.txt b/metadata/net.oschina.app.txt
index 6269dc70c4..b064eae623 100644
--- a/metadata/net.oschina.app.txt
+++ b/metadata/net.oschina.app.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPL
 Web Site:http://www.oschina.net/p/oschina-android-app
 Source Code:https://github.com/oschina/android-app
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 3c2125ed44..2c41185771 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://osmand.net
 Source Code:https://github.com/osmandapp/Osmand
-Issue Tracker:http://code.google.com/p/osmand/issues/list
+Issue Tracker:http://code.google.com/p/osmand/issues
 Donate:http://code.google.com/p/osmand/#Please_support_the_project
 
 Name:OsmAnd~
diff --git a/metadata/net.pagekite.app.txt b/metadata/net.pagekite.app.txt
index c549b27ef2..4f3facdaf0 100644
--- a/metadata/net.pagekite.app.txt
+++ b/metadata/net.pagekite.app.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:AGPLv3
 Web Site:https://pagekite.net
 Source Code:https://github.com/pagekite/AndroidPageKiteApp
@@ -23,8 +23,7 @@ rm jni && ln -s LibPageKite jni && ln -s LibPageKite/net.pagekite.lib src/net/pa
 export NDK_PROJECT_PATH=$$NDK$$ && make -f jni/Makefile android
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.007
 Current Version Code:1212140
 
diff --git a/metadata/net.pejici.summation.txt b/metadata/net.pejici.summation.txt
new file mode 100644
index 0000000000..02000e9f19
--- /dev/null
+++ b/metadata/net.pejici.summation.txt
@@ -0,0 +1,24 @@
+Categories:Office
+License:GPLv3
+Web Site:http://pejici.net/~slobo/projects/summation.html
+Source Code:https://github.com/pejic/Summation
+Issue Tracker:http://pejici.net/~slobo/contact.cgi
+
+Auto Name:Summation
+Summary:Add values from a list
+Description:
+Summation adds values from a list of items. 
+Each item has a label and a number and multiple lists are supported.
+.
+
+Repo Type:git
+Repo:https://github.com/pejic/Summation.git
+
+Build:0.1,1
+    commit=v0.1
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
+
diff --git a/metadata/net.pherth.omnomagon.txt b/metadata/net.pherth.omnomagon.txt
index 7acb2676ee..9703ecab9d 100644
--- a/metadata/net.pherth.omnomagon.txt
+++ b/metadata/net.pherth.omnomagon.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:NewBSD
 Web Site:https://github.com/vIiRuS/Omnomagon
 Source Code:https://github.com/vIiRuS/Omnomagon
diff --git a/metadata/net.phunehehe.foocam.txt b/metadata/net.phunehehe.foocam.txt
new file mode 100644
index 0000000000..f0e667e388
--- /dev/null
+++ b/metadata/net.phunehehe.foocam.txt
@@ -0,0 +1,28 @@
+Categories:Multimedia
+License:MPL
+Web Site:https://github.com/phunehehe/fooCam
+Source Code:https://github.com/phunehehe/fooCam
+Issue Tracker:https://github.com/phunehehe/fooCam/issues
+
+Summary:HDR Camera app
+Description:
+fooCam takes multiple successive shots with different exposure settings. The
+resulting images can be post-processed using image editors such as Luminance
+HDR and Gimp to produce HDR images.
+.
+
+Repo Type:git
+Repo:https://github.com/phunehehe/fooCam.git
+
+Build:2,2
+    commit=v1
+    subdir=fooCam
+    prebuild=../scripts/remove-crittercism.sh
+    scanignore=scripts/remove-crittercism.sh
+    gradle=main
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2
+Current Version Code:2
+
diff --git a/metadata/net.pierrox.mcompass.txt b/metadata/net.pierrox.mcompass.txt
index 26761d7efa..e665d12575 100644
--- a/metadata/net.pierrox.mcompass.txt
+++ b/metadata/net.pierrox.mcompass.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:http://www.pierrox.net/cmsms/open-source/marine-compass-2.html
 Source Code:http://svn.pierrox.net/mcompass/trunk
@@ -12,13 +12,14 @@ Uses the magnetic sensor to show the orientation.
 We don't have v2.0+ as the source code isn't published.
 .
 
-Repo Type:svn
-Repo:http://svn.pierrox.net/mcompass/trunk/
+Repo Type:git-svn
+Repo:http://svn.pierrox.net/mcompass;trunk=trunk;tags=tags
 
-Build Version:1.2.4,10,32
+Build:1.2.4,10
+    commit=mcompass-1.2.4
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:Tags
 Current Version:1.2.4
 Current Version Code:10
 
diff --git a/metadata/net.pmarks.chromadoze.txt b/metadata/net.pmarks.chromadoze.txt
index 9703f8a9f5..0730c811ff 100644
--- a/metadata/net.pmarks.chromadoze.txt
+++ b/metadata/net.pmarks.chromadoze.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/chromadoze/
-Source Code:http://code.google.com/p/chromadoze/source/checkout
-Issue Tracker:http://code.google.com/p/chromadoze/issues/list
+Source Code:http://code.google.com/p/chromadoze/source
+Issue Tracker:http://code.google.com/p/chromadoze/issues
 
 Auto Name:Chroma Doze
 Summary:Noise generator
@@ -30,8 +30,7 @@ Build Version:3.1,12,65,target=android-18,prebuild=\
     $$SDK$$/tools/android update lib-project --path ./appcompat/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:3.1
 Current Version Code:12
 
diff --git a/metadata/net.progval.android.andquote.txt b/metadata/net.progval.android.andquote.txt
index 769da2f2cc..6231e4fb4f 100644
--- a/metadata/net.progval.android.andquote.txt
+++ b/metadata/net.progval.android.andquote.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:NewBSD
 Web Site:https://github.com/ProgVal/AndQuote
 Source Code:https://github.com/ProgVal/AndQuote
diff --git a/metadata/net.rocrail.androc.txt b/metadata/net.rocrail.androc.txt
index fc3fd8a745..1437eabc20 100644
--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://wiki.rocrail.net/doku.php?id=androc-intro-en
 Source Code:https://code.launchpad.net/~rocrail-project/rocrail/androc
@@ -14,60 +14,197 @@ controller.
 Repo Type:bzr
 Repo:lp:rocrail/androc
 
-Build Version:1.1.219,219,219
-Build Version:1.1.221,221,221
-Build Version:1.2.224,224,!No source for this version in repo
-Build Version:1.2.228,228,228
-Build Version:1.3.230,230,230
-Build Version:1.4.252,252,252
-Build Version:1.4.266,266,266
-Build Version:1.4.273,273,273
-Build Version:1.4.280,280,280
-Build Version:1.4.281,281,281
-Build Version:1.4.284,284,284
-Build Version:1.4.286,286,286
-Build Version:1.4.289,289,289
-Build Version:1.5.315,315,315
-Build Version:1.5.317,317,!wrong version code
-Build Version:1.5.324,324,324
-Build Version:1.5.324,324,324
-Build Version:339,339,339
-Build Version:342,342,342,target=android-14
-Build Version:344,344,344,target=android-14
-Build Version:345,345,345,target=android-14
-Build Version:347,347,347,target=android-14
-Build Version:348,348,348,target=android-14
-Build Version:350,350,350,target=android-14
-Build Version:351,351,351,target=android-14
-Build Version:359,359,359,target=android-14
-Build Version:362,362,362,target=android-14
-Build Version:365,365,365,target=android-14
-Build Version:366,366,366,target=android-14
-Build Version:369,369,369,target=android-14
-Build Version:371,371,371,target=android-14
-Build Version:373,373,373,target=android-14
-Build Version:375,375,375,target=android-14
-Build Version:376,376,376,target=android-14
-Build Version:377,377,!wrong version code at 377,target=android-14
-Build Version:379,379,379,target=android-14
-Build Version:381,381,381,target=android-14
-Build Version:386,386,386,target=android-14
-Build Version:388,388,388,target=android-14
-Build Version:389,389,389,target=android-14
-Build Version:391,391,391,target=android-14
-Build Version:392,392,392,target=android-14
-Build Version:393,393,393,target=android-14
-Build Version:395,395,395,target=android-14
-Build Version:398,398,398,target=android-14
-Build Version:399,399,399,target=android-14
-Build Version:401,401,402,target=android-14
-Build Version:407,407,407,target=android-14
-Build Version:409,409,409,target=android-14
-Build Version:414,414,414,target=android-14
+Build:1.1.219,219
+    commit=219
+
+Build:1.1.221,221
+    commit=221
+
+Build:1.2.224,224
+    disable=No source for this version in repo
+    commit=unknown - see disabled
+
+Build:1.2.228,228
+    commit=228
+
+Build:1.3.230,230
+    commit=230
+
+Build:1.4.252,252
+    commit=252
+
+Build:1.4.266,266
+    commit=266
+
+Build:1.4.273,273
+    commit=273
+
+Build:1.4.280,280
+    commit=280
+
+Build:1.4.281,281
+    commit=281
+
+Build:1.4.284,284
+    commit=284
+
+Build:1.4.286,286
+    commit=286
+
+Build:1.4.289,289
+    commit=289
+
+Build:1.5.315,315
+    commit=315
+
+Build:1.5.317,317
+    disable=wrong version code
+    commit=unknown - see disabled
+
+Build:1.5.324,324
+    commit=324
+
+Build:1.5.324,324
+    commit=324
+
+Build:339,339
+    commit=339
+
+Build:342,342
+    commit=342
+    target=android-14
+
+Build:344,344
+    commit=344
+    target=android-14
+
+Build:345,345
+    commit=345
+    target=android-14
+
+Build:347,347
+    commit=347
+    target=android-14
+
+Build:348,348
+    commit=348
+    target=android-14
+
+Build:350,350
+    commit=350
+    target=android-14
+
+Build:351,351
+    commit=351
+    target=android-14
+
+Build:359,359
+    commit=359
+    target=android-14
+
+Build:362,362
+    commit=362
+    target=android-14
+
+Build:365,365
+    commit=365
+    target=android-14
+
+Build:366,366
+    commit=366
+    target=android-14
+
+Build:369,369
+    commit=369
+    target=android-14
+
+Build:371,371
+    commit=371
+    target=android-14
+
+Build:373,373
+    commit=373
+    target=android-14
+
+Build:375,375
+    commit=375
+    target=android-14
+
+Build:376,376
+    commit=376
+    target=android-14
+
+Build:377,377
+    disable=wrong version code at 377
+    commit=377
+    target=android-14
+
+Build:379,379
+    commit=379
+    target=android-14
+
+Build:381,381
+    commit=381
+    target=android-14
+
+Build:386,386
+    commit=386
+    target=android-14
+
+Build:388,388
+    commit=388
+    target=android-14
+
+Build:389,389
+    commit=389
+    target=android-14
+
+Build:391,391
+    commit=391
+    target=android-14
+
+Build:392,392
+    commit=392
+    target=android-14
+
+Build:393,393
+    commit=393
+    target=android-14
+
+Build:395,395
+    commit=395
+    target=android-14
+
+Build:398,398
+    commit=398
+    target=android-14
+
+Build:399,399
+    commit=399
+    target=android-14
+
+Build:401,401
+    commit=402
+    target=android-14
+
+Build:407,407
+    commit=407
+    target=android-14
+
+Build:409,409
+    commit=409
+    target=android-14
+
+Build:414,414
+    commit=414
+    target=android-14
+
+Build:418,418
+    commit=418
+    target=android-14
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:414
-Current Version Code:414
+Update Check Mode:RepoManifest
+Current Version:418
+Current Version Code:418
 
diff --git a/metadata/net.sf.andbatdog.batterydog.txt b/metadata/net.sf.andbatdog.batterydog.txt
index 4d7a62fd75..85b02b2319 100644
--- a/metadata/net.sf.andbatdog.batterydog.txt
+++ b/metadata/net.sf.andbatdog.batterydog.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2+
 Web Site:http://andbatdog.sourceforge.net/
 Source Code:http://sourceforge.net/projects/andbatdog/develop
@@ -14,13 +14,13 @@ information, the file “/sdcard/BatteryDog/battery.csv” is created containing
 the recorded battery levels together with a timestamp.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://andbatdog.svn.sourceforge.net/svnroot/andbatdog/trunk/AndroidBatteryDog/AndroidBatteryDog
 
 Build Version:0.1.1,11,22,encoding=iso-8859-1
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:RepoManifest
 Current Version:0.1.1
 Current Version Code:11
 
diff --git a/metadata/net.sf.andhsli.hotspotlogin.txt b/metadata/net.sf.andhsli.hotspotlogin.txt
index c4807207ba..88c3497171 100644
--- a/metadata/net.sf.andhsli.hotspotlogin.txt
+++ b/metadata/net.sf.andhsli.hotspotlogin.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:http://andhsli.sourceforge.net/
 Source Code:http://andhsli.svn.sourceforge.net/viewvc/andhsli/HotspotLogin/
diff --git a/metadata/net.sf.times.txt b/metadata/net.sf.times.txt
new file mode 100644
index 0000000000..d62d7b605a
--- /dev/null
+++ b/metadata/net.sf.times.txt
@@ -0,0 +1,29 @@
+Categories:Science & Education
+License:GPLv3
+Web Site:http://sourceforge.net/p/halachictimes
+Source Code:http://svn.code.sf.net/p/halachictimes/code
+Issue Tracker:
+
+Auto Name:Halachic Prayer Times
+Summary:Times for Jewish prayers
+Description:
+List of halachic/halakhic times for Jewish prayers (zmanim and zmanei tefillot).
+It also has a prayer compass, time opinions, and reminders.
+.
+
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/halachictimes/code;trunk=trunk;tags=tags
+
+Build:2.5,22
+    commit=ver_22 rev_270
+    subdir=Halachic Times
+
+Build:3.0,23
+    commit=ver_23 rev_291
+    subdir=Halachic Times
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:3.0
+Current Version Code:23
+
diff --git a/metadata/net.solutinno.websearch.txt b/metadata/net.solutinno.websearch.txt
new file mode 100644
index 0000000000..9c72a8879f
--- /dev/null
+++ b/metadata/net.solutinno.websearch.txt
@@ -0,0 +1,46 @@
+Categories:System
+License:Apache2
+Web Site:http://balesz.github.io/android-WebSearch
+Source Code:https://github.com/balesz/android-WebSearch
+Issue Tracker:https://github.com/balesz/android-WebSearch/issues
+
+Auto Name:WebSearch
+Summary:Search the web from within apps
+Description:
+If an app allows you to select plain text then the selected text is shared to this app,
+which in turn, opens it in your search engine of choice, provided it obeys 
+the OpenSearch format.
+
+You manage your search engines on the admin UI. 
+You can import engines from an url, or you can add new engines by hand: for 
+examples, see OpenSearch engines from [http://mycroftproject.com Mycroft project] 
+and http://www.searchplugins.net. 
+If you tap the import icon on the action bar, a dialog will appear. 
+You have to fill the url edit box, then tap the import button. 
+You have to fill in at least the name and the url fields. 
+There is a paste icon on the right side of the url field; if you tap this icon, 
+it will paste a "{searchTerms}" string into the url field. 
+This is necessary because this string will be replaced by your search string in the url.
+
+For example, Wikipedia English is:
+[https://secure.wikimedia.org/wikipedia/en/w/index.php?title=Special%3ASearch&search={searchTerms}&button=1 https://secure.wikimedia.org/wikipedia/en/w/index.php?title=Special%3ASearch&search={searchTerms}&button=1]
+.
+
+Repo Type:git
+Repo:https://github.com/balesz/android-WebSearch.git
+
+Build:1.0.3,6
+    commit=8af7
+    subdir=WebSearch
+    submodules=yes
+    gradle=yes
+
+Maintainer Notes:
+see build.gradle for version name
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:Unknown
+Current Version Code:6
+
diff --git a/metadata/net.somethingdreadful.MAL.txt b/metadata/net.somethingdreadful.MAL.txt
new file mode 100644
index 0000000000..c9d2e61274
--- /dev/null
+++ b/metadata/net.somethingdreadful.MAL.txt
@@ -0,0 +1,31 @@
+Categories:Reading
+License:NewBSD
+Web Site:http://atarashiiapp.com
+Source Code:https://github.com/AnimaSA/Atarashii
+Issue Tracker:https://github.com/AnimaSA/Atarashii/issues
+
+Auto Name:Atarashii!
+Summary:MyAnimeList (MAL) client
+Description:
+"Atarashii" is Japanese for "New, Modern". 
+Atarashii! aims to be a modern, native Android app for managing your MAL.
+
+You'll need an account on that website or to create one in the app.
+.
+
+Repo Type:git
+Repo:https://github.com/AnimaSA/Atarashii.git
+
+Build:1.3.1,12
+    commit=1.3.1
+    subdir=Atarashii
+    extlibs=android/android-support-v4.jar
+    srclibs=1:NumberPicker-SimonVT@35e4d;2:ActionBarSherlock@c0d437;3:Crouton@b6735;4:SherlockNavDrawer@808a1
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        mv libs/android-support-v4.jar $$Crouton$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3.1
+Current Version Code:12
+
diff --git a/metadata/net.sourceforge.andsys.txt b/metadata/net.sourceforge.andsys.txt
index 80c63e0d71..b0e0bf565e 100644
--- a/metadata/net.sourceforge.andsys.txt
+++ b/metadata/net.sourceforge.andsys.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:http://andsys.sourceforge.net
 Source Code:http://sourceforge.net/p/andsys/git
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 2d7efa7c11..277b8c52a1 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://sourceforge.net/projects/servestream
 Source Code:http://sourceforge.net/p/servestream/code/commit_browser
@@ -24,69 +24,63 @@ if you find an audio file on a web page, share the link to Servestream.
 .
 
 #Repo:https://servestream.svn.sourceforge.net/svnroot/servestream/trunk; old url prior to r1160
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
 
-#Repo Type:git-svn
-#Repo:http://svn.code.sf.net/p/servestream/code;trunk=trunk;tags=tags
+Build:0.5.4,69
+    commit=1354
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=rm custom_rules.xml && \
+        echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
+        wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?format=raw --output-document=arm-build.sh && \
+        tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
+        chmod +x arm-build.sh && \
+        mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \
+        sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \
+        cd ffmpeg-0.11.1-android-2012-09-18 && \
+        ./extract.sh && \
+        sed -i 's/make -j4/make -j1/g' arm-build.sh && \
+        sed -i 's/bash/sh/g' arm-build.sh && \
+        sed -i '/PIPESTATUS/d' arm-build.sh && \
+        NDK=$$NDK$$ ./arm-build.sh && \
+        cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg
+    buildjni=yes
 
-Repo Type:svn
-Repo:http://svn.code.sf.net/p/servestream/code/trunk
+Build:0.6.0,72
+    commit=v0.6.0
+    srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1
+    prebuild=sed -i 's/make -j4/make -j2/g' scripts/* && \
+        rm custom_rules.xml && \
+        chmod +x scripts/build-ffmpeg.sh && \
+        cp $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
+        echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
+        echo "android.library.reference.2=$$DragSort$$" >> project.properties
+    build=./scripts/build-ffmpeg.sh
+    buildjni=yes
 
-#Build Version:0.1,35,374,prebuild=mv lib/ libs/
-#Build Version:0.2.5,40,!source has wrong version code at r442,prebuild=mv lib/ libs/
-#The following is a guess at the correct revision. Most of the commits in
-#this project don't even have any comment at all!?
-#Build Version:0.2.11,46,614,prebuild=mv lib/ libs/
-#Still guessing, see previous comment
-#Build Version:0.3.1,48,659,prebuild=mv lib/ libs/
-#Build Version:0.4.4,54,957,prebuild=mv lib/ libs/
-#Build Version:0.4.6,56,999,prebuild=mv lib/ libs/
-#Build Version:0.4.7,57,1013,prebuild=mv lib/ libs/
-#Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/
-#Build Version:0.4.9,59,1049,buildjni=no
-#Build Version:0.4.12,62,1160,buildjni=no
-Build Version:0.5.4,69,1354,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-rm custom_rules.xml && echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?\
-format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
-wget http://sourceforge.net/p/servestream/code/1311/tree/ffmpeg/scripts/arm-build.sh?\
-format=raw --output-document=arm-build.sh && \
-tar -xvf ffmpeg-0.11.1-android-2012-09-18.tar.gz && \
-chmod +x arm-build.sh && \
-mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && \
-sed -i 's/armeabi armeabi-v7a x86 mips/armeabi/g' jni/Application.mk && \
-cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \
-sed -i 's/make -j4/make -j1/g' arm-build.sh && \
-sed -i 's/bash/sh/g' arm-build.sh && \
-sed -i '/PIPESTATUS/d' arm-build.sh && \
-NDK=$$NDK$$ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg,buildjni=yes
+Build:0.6.3,78
+    commit=v0.6.3
+    srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2
+    prebuild=cp $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
+        rm libs/streamscraper.jar && \
+        cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \
+        cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
+        cp $$Jericho$$/compile-time-dependencies/* libs/ && \
+        sed -i 's/make -j4/make -j2/g' scripts/* && \
+        rm custom_rules.xml && \
+        chmod +x scripts/build-ffmpeg.sh && \
+        sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties
+    build=./scripts/build-ffmpeg.sh
+    buildjni=yes
 
-Build Version:0.6.0,72,v0.6.0,\
-srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1,prebuild=\
-sed -i 's/make -j4/make -j2/g' scripts/* && \
-rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \
-cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
-echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties && \
-echo "android.library.reference.2=$$DragSort$$" >> project.properties,\
-build=./scripts/build-ffmpeg.sh,buildjni=yes
+Build:0.6.4,82
+    commit=v0.6.4
+    disable=Can't figure out the right combination of android-support jars to make it work - srclibs and app have multiple copies
 
-Build Version:0.6.3,78,r1502,\
-srclibs=ActionBarSherlock@4.2.0;DragSort@0.6.1;Streamscraper@f01d9ac64629;Jericho@3.2,\
-prebuild=cp -f $$ActionBarSherlock$$/libs/android-support-v4.jar $$DragSort$$/libs/ && \
-         rm libs/streamscraper.jar && \
-         cp -r $$Streamscraper$$/src/net/moraleboost/ src/net/ && \
-         cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
-         cp $$Jericho$$/compile-time-dependencies/* libs/ && \
-         sed -i 's/make -j4/make -j2/g' scripts/* && \
-         rm custom_rules.xml && chmod +x scripts/build-ffmpeg.sh && \
-         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties,\
-build=./scripts/build-ffmpeg.sh,\
-buildjni=yes
-
-# sed -i 's/x86 mips/mips/g' jni/Application.mk && \
 Auto Update Mode:None
-# Tags not working and e.g. v0.6.3 doesn't even check out
-Update Check Mode:None
-Current Version:0.6.3
-Current Version Code:78
+Update Check Mode:Tags
+Current Version:0.6.4
+Current Version Code:82
 
diff --git a/metadata/net.sourceforge.subsonic.androidapp.txt b/metadata/net.sourceforge.subsonic.androidapp.txt
index e6021a825f..78bb862408 100644
--- a/metadata/net.sourceforge.subsonic.androidapp.txt
+++ b/metadata/net.sourceforge.subsonic.androidapp.txt
@@ -1,7 +1,7 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://www.subsonic.org/pages/index.jsp
-Source Code:http://sourceforge.net/p/subsonic/code/commit_browser
+Source Code:http://sourceforge.net/p/subsonic
 Issue Tracker:
 Donate:http://www.subsonic.org/pages/index.jsp
 
@@ -20,16 +20,28 @@ by making a donation. (A key isn't required to use the
 [https://github.com/Mach5/supersonic Supersonic] variant.)
 .
 
-# Just check out source code for Android app
 Repo Type:git-svn
 Repo:svn://svn.code.sf.net/p/subsonic/code/trunk/subsonic-android
 
-Build Version:3.3,46,2589,target=android-10
-Build Version:3.8,51,3477
+Build:3.3,46
+    commit=2589
+    target=android-10
+
+Build:3.8,51
+    commit=3477
+
+Build:4.0,53
+    commit=3577
+
+Build:4.1,54
+    commit=3640
+
+Maintainer Notes:
+Tags unreliable - don't use.
+.
 
 Auto Update Mode:None
-# There are tags higher up the tree but currently one version late
 Update Check Mode:RepoManifest
-Current Version:3.8
-Current Version Code:51
+Current Version:4.1
+Current Version Code:54
 
diff --git a/metadata/net.sourceforge.wifiremoteplay.txt b/metadata/net.sourceforge.wifiremoteplay.txt
new file mode 100644
index 0000000000..8a69161ce1
--- /dev/null
+++ b/metadata/net.sourceforge.wifiremoteplay.txt
@@ -0,0 +1,28 @@
+Categories:Multimedia
+License:GPLv3+
+Web Site:http://homepage.ntlworld.com/mark.harman/comp_wifiremoteplay.html
+Source Code:http://sourceforge.net/p/wifiremoteplay/android_native
+Issue Tracker:http://sourceforge.net/p/wifiremoteplay/tickets/
+Donate:http://sourceforge.net/donate/?user_id=439017
+Bitcoin:1LKCFto9SQGqtcvqZxHkqDPqNjSnfMmsow
+
+Auto Name:Wifi Remote Play
+Summary:Media remote control
+Description:
+Remote Control for MPC (Music Player Daemon) and VLC.
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/wifiremoteplay/android_native
+
+Build:1.11,7
+    commit=v1.11
+
+Build:1.12,8
+    commit=v1.12
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.12
+Current Version Code:8
+
diff --git a/metadata/net.status.client.mobile.txt b/metadata/net.status.client.mobile.txt
index 663e67c610..cabce29e06 100644
--- a/metadata/net.status.client.mobile.txt
+++ b/metadata/net.status.client.mobile.txt
@@ -1,5 +1,5 @@
 Disabled:Doesn't work and we can't build it as it uses Titanium SDK
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://status.net/wiki/Client
 Source Code:http://www.gitorious.org/statusnet-client
diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt
index d3e39942e7..3700472e2a 100644
--- a/metadata/net.sylvek.sharemyposition.txt
+++ b/metadata/net.sylvek.sharemyposition.txt
@@ -1,10 +1,11 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/sharemyposition
-Source Code:http://code.google.com/p/sharemyposition/source/checkout
-Issue Tracker:http://code.google.com/p/sharemyposition/issues/list
+Source Code:http://code.google.com/p/sharemyposition/source
+Issue Tracker:http://code.google.com/p/sharemyposition/issues
 
-Auto Name:share my position
+Auto Name:My position
 Summary:Share your location
 Description:
 A simple way of sharing your location via a widget. You can send a message
@@ -14,21 +15,36 @@ registered sharing application. For example, an SMS message.
 The recipient is sent a link to a web page that displays the location
 on a Google map, though the app itself uses OSM. (The source for the web
 service is in the same repository as the client).
+
+Anti-Feature:UpstreamNonFree - App now requires Google Play Services, and so
+it can't be updated in our repos.
 .
 
 Repo Type:git-svn
 #Note - deliberately pulling from trunk, not trunk/ShareMyPosition-android,
 #even though that would be more efficient, in order to preserve the
 #corresponding source for the web service in our source tarball.
-Repo:http://sharemyposition.googlecode.com/svn/trunk/
+Repo:http://sharemyposition.googlecode.com/svn/trunk/ShareMyPosition-android
 
-Build Version:1.0.11,16,64,subdir=ShareMyPosition-android
-Build Version:1.1.0-beta3,20,70,subdir=ShareMyPosition-android,target=android-11,prebuild=mv lib libs
-Build Version:1.1.2,24,75,subdir=ShareMyPosition-android,target=android-11,prebuild=mv lib libs
+Build:1.0.11,16
+    commit=64
+
+Build:1.1.0-beta3,20
+    commit=70
+    target=android-11
+    prebuild=mv lib libs
+
+Build:1.1.2,24
+    commit=75
+    target=android-11
+    prebuild=mv lib libs
+
+Build:1.2.9,34
+    disable=needs GPlay services
+    commit=92
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.2
-Current Version Code:24
+Update Check Mode:RepoManifest
+Current Version:1.2.9
+Current Version Code:34
 
diff --git a/metadata/net.szym.barnacle.txt b/metadata/net.szym.barnacle.txt
index a042c8ad02..193c3c0bc1 100644
--- a/metadata/net.szym.barnacle.txt
+++ b/metadata/net.szym.barnacle.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://szym.net/barnacle
 Source Code:https://github.com/szym/barnacle
diff --git a/metadata/net.tapi.handynotes.txt b/metadata/net.tapi.handynotes.txt
index d0715406f4..a2fffe465a 100644
--- a/metadata/net.tapi.handynotes.txt
+++ b/metadata/net.tapi.handynotes.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://github.com/atd/HandyNotes
 Source Code:http://github.com/atd/HandyNotes
diff --git a/metadata/net.tedstein.AndroSS.txt b/metadata/net.tedstein.AndroSS.txt
index 88f621b212..5dedd7acc6 100644
--- a/metadata/net.tedstein.AndroSS.txt
+++ b/metadata/net.tedstein.AndroSS.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://github.com/tstein/AndroSS
 Source Code:https://github.com/tstein/AndroSS
@@ -22,11 +22,10 @@ Build Version:0.2.2,8,v0.2.2,buildjni=yes,target=android-8
 Build Version:0.3.-1,10,v0.3.-1,buildjni=yes,target=android-8
 Build Version:0.3.2,13,v0.3.2,buildjni=yes,target=android-8
 Build Version:0.4.2,16,4a9161b6f94d07e3da030a66c0a24fda06f3a53d,buildjni=yes,target=android-8
-Build Version:0.4.3,17,a03d152e4a17c1d01ca4cb3ae3fc473be5736920,buildjni=yes,target=android-8
+Build Version:0.4.3,17,v0.4.3,buildjni=yes,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.4.3
 Current Version Code:17
 
diff --git a/metadata/net.tevp.postcode.txt b/metadata/net.tevp.postcode.txt
index f9e071366d..9c0078d3c2 100644
--- a/metadata/net.tevp.postcode.txt
+++ b/metadata/net.tevp.postcode.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://www.lshift.net/blog/2010/09/26/android-postcode-app
 Source Code:http://github.com/palfrey/postcode
@@ -13,9 +13,10 @@ A simple way to retrieve the postcode for your current location.
 Repo Type:git
 Repo:http://github.com/palfrey/postcode.git
 
+Build Version:1.1,2,f2832,target=android-10
+
 Auto Update Mode:None
-#Build Version:1.1,2,!wait for client f2832
-Update Check Mode:Static
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/net.thauvin.erik.android.noussd.txt b/metadata/net.thauvin.erik.android.noussd.txt
index b9e08aad89..236261953d 100644
--- a/metadata/net.thauvin.erik.android.noussd.txt
+++ b/metadata/net.thauvin.erik.android.noussd.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:http://mobile.thauvin.net/android/#noussd
 Source Code:https://github.com/ethauvin/NoUSSD
diff --git a/metadata/net.vivekiyer.GAL.txt b/metadata/net.vivekiyer.GAL.txt
index 588a9516c4..dfb0a03e6e 100644
--- a/metadata/net.vivekiyer.GAL.txt
+++ b/metadata/net.vivekiyer.GAL.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/corporateaddressbook/
-Source Code:http://code.google.com/p/corporateaddressbook/source/checkout
-Issue Tracker:http://code.google.com/p/corporateaddressbook/issues/list
+Source Code:http://code.google.com/p/corporateaddressbook/source
+Issue Tracker:http://code.google.com/p/corporateaddressbook/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=vivekiyer%40gmail%2ecom&item_name=Donate%20to%20CorporateAddressBook
 
 Auto Name:Corporate Addressbook
diff --git a/metadata/net.wigle.wigleandroid.txt b/metadata/net.wigle.wigleandroid.txt
index 2dca41644a..f942cf3bf7 100644
--- a/metadata/net.wigle.wigleandroid.txt
+++ b/metadata/net.wigle.wigleandroid.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:BSD
 Web Site:http://wigle.net
 Source Code:https://github.com/wiglenet/wigle-wifi-wardriving
@@ -25,11 +25,24 @@ to the [http://wigle.net wigle.net] database (read the [https://github.com/wigle
 Repo Type:git
 Repo:https://github.com/wiglenet/wigle-wifi-wardriving.git
 
-Build Version:1.53,53,1.53,rm=dist/wigle-wifi-wardriving.apk,update=force,prebuild=\
-sed -i '518\,557d' src/net/wigle/wigleandroid/MappingActivity.java
-Build Version:1.55,55,1.55,prebuild=sed -i '518\,557d' src/net/wigle/wigleandroid/MappingActivity.java,rm=dist/wigle-wifi-wardriving.apk,update=force
+Build:1.53,53
+    commit=1.53
+    rm=dist/wigle-wifi-wardriving.apk
+    update=force
+    prebuild=sed -i '518,557d' src/net/wigle/wigleandroid/MappingActivity.java
 
-Auto Update Mode:None
+Build:1.55,55
+    commit=1.55
+    rm=dist/wigle-wifi-wardriving.apk
+    update=force
+    prebuild=sed -i '518,557d' src/net/wigle/wigleandroid/MappingActivity.java
+
+Build:1.57,57
+    commit=1.57
+    update=force
+    prebuild=sed -i '/private void tryEvil()/,/^\/\/  }/d' src/net/wigle/wigleandroid/MappingActivity.java
+
+Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:1.57
 Current Version Code:57
diff --git a/metadata/net.xenotropic.quizznworldcap.txt b/metadata/net.xenotropic.quizznworldcap.txt
index f88f5c84f9..acd8c292c7 100644
--- a/metadata/net.xenotropic.quizznworldcap.txt
+++ b/metadata/net.xenotropic.quizznworldcap.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:https://github.com/xenotropic/quizzn
 Source Code:https://github.com/xenotropic/quizzn
diff --git a/metadata/nf.frex.android.txt b/metadata/nf.frex.android.txt
new file mode 100644
index 0000000000..374eddf9e8
--- /dev/null
+++ b/metadata/nf.frex.android.txt
@@ -0,0 +1,30 @@
+Categories:Science & Education
+License:GPLv3
+Web Site:http://code.google.com/p/frex-app
+Source Code:http://code.google.com/p/frex-app/source
+Issue Tracker:http://code.google.com/p/frex-app/issues
+
+Auto Name:Frex
+Summary:Fractal viewer
+Description:
+Generate unusual fractals such as Burning Ship and Odd Onion.
+The [http://code.google.com/p/frex-app/wiki/FrexExamples gallery]
+has some amazing examples which can be opened via the app, since they have the 
+.frex extension.
+.
+
+Repo Type:git
+Repo:https://code.google.com/p/frex-app/
+
+Build:1.2.2,10
+    commit=196d7c
+    rm=materials
+
+Build:1.3,11
+    disable=not published
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:11
+
diff --git a/metadata/nitezh.ministock.txt b/metadata/nitezh.ministock.txt
index 2fcaa5ecb0..d682ff4004 100644
--- a/metadata/nitezh.ministock.txt
+++ b/metadata/nitezh.ministock.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:http://niteshpatel.github.io/ministocks
 Source Code:https://github.com/niteshpatel/ministocks
@@ -14,11 +14,17 @@ same symbols.
 Repo Type:git
 Repo:https://github.com/niteshpatel/ministocks.git
 
-Build Version:50,50,version-50
-Build Version:51,51,version-51
+Build:50,50
+    commit=version-50
 
-Auto Update Mode:None
+Build:51,51
+    commit=version-51
+
+Build:52,52
+    commit=version-52
+
+Auto Update Mode:Version version-%v
 Update Check Mode:Tags
-Current Version:51
-Current Version Code:51
+Current Version:52
+Current Version Code:52
 
diff --git a/metadata/nl.frankkie.bronylivewallpaper.txt b/metadata/nl.frankkie.bronylivewallpaper.txt
new file mode 100644
index 0000000000..31a4297691
--- /dev/null
+++ b/metadata/nl.frankkie.bronylivewallpaper.txt
@@ -0,0 +1,35 @@
+Categories:Wallpaper
+License:Apache2
+Web Site:http://frankkie.nl
+Source Code:https://github.com/frankkienl/BronyLiveWallpaper
+Issue Tracker:https://github.com/frankkienl/BronyLiveWallpaper/issues
+
+Name:Brony Live Wallpaper
+Auto Name:BronyLiveWallpaper
+Summary:Animated ponies
+Description:
+Featuring characters from MLP:FIM (trademarked to Hasbro Inc.).
+
+GIFs are from the [http://desktopponies.bugs3.com Desktop Ponies]
+project and licensed as CCBYSANC.
+
+Status: Beta
+.
+
+Repo Type:git
+Repo:https://github.com/frankkienl/BronyLiveWallpaper.git
+
+Build:1.2.2,8
+    commit=v1.2.2
+    subdir=BronyLiveWallpaper
+    gradle=yes
+Build:1.3,9
+    commit=v1.3
+    subdir=BronyLiveWallpaper
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3
+Current Version Code:9
+
diff --git a/metadata/nl.mpcjanssen.simpletask.txt b/metadata/nl.mpcjanssen.simpletask.txt
new file mode 100644
index 0000000000..0e1e99e2ed
--- /dev/null
+++ b/metadata/nl.mpcjanssen.simpletask.txt
@@ -0,0 +1,65 @@
+Categories:Office
+License:GPLv3
+Web Site:https://mpcjanssen.nl/fossil/simpletask
+Source Code:https://gitorious.org/simpletask/android
+Issue Tracker:https://mpcjanssen.nl/fossil/simpletask/reportlist
+
+Auto Name:Simpletask
+Summary:Todo list manager
+Description:
+A simple task list manager that strives to have just enough features to do GTD
+(the Getting Things Done methodology), but no more. 
+Based on the [http://todotxt.com todo.txt] app so all info is stored in a
+single text file called todo.txt.
+Note that, with this version, you will need to take care of backups yourself.
+
+* Todo list stored in the documented todo.txt format
+* Comprehensive filtering and multi sort
+* Create calendar reminders for specific tasks directly from the app
+* Select on or more tasks and press overflow menu->Add reminder
+* Share the complete tasklist or selected tasks using the Android share feature
+* Tasks can deferred into the future. Combined with the "Creation date in future" sort it allows you to get tasks out of your face (as in 1MTD/MYN)
+.
+
+Repo Type:git
+Repo:https://gitorious.org/simpletask/android.git
+
+Build:3.2.2-cloudless (unknown),1053
+    commit=93a8922b2cd4696f49214ae46b011a1f5d7aadb8
+    gradle=cloudless
+
+Build:3.2.3,1054
+    commit=3_2_3
+    gradle=cloudless
+
+Build:4.0.3,1058
+    commit=4_0_3
+    gradle=cloudless
+
+Build:4.0.5,1060
+    commit=4_0_5
+    gradle=cloudless
+
+Build:4.0.7,1062
+    commit=4_0_7
+    gradle=cloudless
+
+Build:4.0.10,1065
+    disable=insists on having old gradle version
+    commit=4_0_10
+    gradle=cloudless
+
+Build:4.1.1,1067
+    commit=3b99936
+    gradle=cloudless
+
+Build:4.1.3,1069
+    commit=4_1_3
+    init=rm libs/*.jar
+    gradle=cloudless
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:4.1.3
+Current Version Code:1069
+
diff --git a/metadata/nl.sogeti.android.gpstracker.txt b/metadata/nl.sogeti.android.gpstracker.txt
index 6eb09c91ab..bbcff4c7cd 100644
--- a/metadata/nl.sogeti.android.gpstracker.txt
+++ b/metadata/nl.sogeti.android.gpstracker.txt
@@ -1,9 +1,9 @@
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/open-gpstracker/
-Source Code:http://code.google.com/p/open-gpstracker/source/list
-Issue Tracker:http://code.google.com/p/open-gpstracker/issues/list
+Source Code:http://code.google.com/p/open-gpstracker/source
+Issue Tracker:http://code.google.com/p/open-gpstracker/issues
 
 Summary:GPS Logger
 Description:
diff --git a/metadata/nl.ttys0.simplec25k.txt b/metadata/nl.ttys0.simplec25k.txt
index 153a4d36a3..cf1bfe76c0 100644
--- a/metadata/nl.ttys0.simplec25k.txt
+++ b/metadata/nl.ttys0.simplec25k.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://simplec25k.ttys0.nl
 Source Code:https://github.com/roelb/Simple-C25K
@@ -19,8 +19,7 @@ Build Version:0.2.3,7,9dbc2a401d60cc
 Build Version:0.2.4,8,f1d43b15599ed4
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.2.4
 Current Version Code:8
 
diff --git a/metadata/no.rkkc.bysykkel.txt b/metadata/no.rkkc.bysykkel.txt
index f769e51307..07428db0a2 100644
--- a/metadata/no.rkkc.bysykkel.txt
+++ b/metadata/no.rkkc.bysykkel.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://www.kind-kristiansen.no/projects/bysyklist-oslo
 Source Code:https://gitorious.org/bysyklist/bysyklist
@@ -34,8 +34,7 @@ Build Version:1.1.2,25,1a6785f288967205bd347ec7af07bc8a525b473b
 Build Version:1.1.3,26,a81b6dee91993ff6f0dd0299b1195f60e06c967f
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1.3
 Current Version Code:26
 
diff --git a/metadata/nu.firetech.android.pactrack.txt b/metadata/nu.firetech.android.pactrack.txt
index 1194ee6f92..694dfad4fe 100644
--- a/metadata/nu.firetech.android.pactrack.txt
+++ b/metadata/nu.firetech.android.pactrack.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2+
 Web Site:http://firetech.nu/pactrackdroid/
 Source Code:https://github.com/firetech/PactrackDroid
diff --git a/metadata/nz.gen.geek_central.ObjViewer.txt b/metadata/nz.gen.geek_central.ObjViewer.txt
new file mode 100644
index 0000000000..e097b6e7f8
--- /dev/null
+++ b/metadata/nz.gen.geek_central.ObjViewer.txt
@@ -0,0 +1,50 @@
+Categories:Science & Education
+License:Apache2
+Web Site:
+Source Code:https://github.com/ldo/ObjViewer_Android
+Issue Tracker:https://github.com/ldo/ObjViewer_Android/issues
+
+Auto Name:ObjViewer
+Summary:Basic 3D model viewer
+Description:
+Copy the .obj file that you want to view (and associated .mtl file, if
+any) onto a directory named “Models” on the SD card of the Android
+device. It should then appear in the list that is shown when you
+select “Open...” from the options menu in ObjViewer.
+
+You can interactively adjust the orientation of the object by dragging
+across the view; drag across the middle part to rotate about the X
+(horizontal) and Y (vertical) axes, and drag around the periphery to
+rotate about the Z axis (perpendicular to the view) as well.
+
+To see any colours that might be defined for the surfaces of your model,
+turn on lighting.
+
+If parts of the surface of the object seem to disappear, try switching
+the order of vertices in a forward-looking face under “Orient Faces...”.
+
+“Reset View” animates rotating the object back to its initial orientation.
+“Random View” animates rotating the object to a random orientation.
+
+If you want to find downloadable models to view, here are a couple of
+lists of likely websites:
+<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Sources_of_free_3D_models>
+<http://wiki.blender.org/index.php/Doc:Tutorials/Resources/Models>.
+.
+
+Repo Type:git
+Repo:https://github.com/ldo/ObjViewer_Android.git
+
+Build:15877.1,1
+    commit=21548cdd0fcfd0
+    update=force
+
+Maintainer Notes:
+Never bumps version code
+.
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:15877.1
+Current Version Code:1
+
diff --git a/metadata/orbitlivewallpaperfree.puzzleduck.com.txt b/metadata/orbitlivewallpaperfree.puzzleduck.com.txt
index a062b24036..923c317cb5 100644
--- a/metadata/orbitlivewallpaperfree.puzzleduck.com.txt
+++ b/metadata/orbitlivewallpaperfree.puzzleduck.com.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv2
 Web Site:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper/
 Source Code:https://github.com/PuZZleDucK/Orbital-Live-Wallpaper
diff --git a/metadata/org.ab.x48.txt b/metadata/org.ab.x48.txt
index 1d918b1e44..b98cc7a8ca 100644
--- a/metadata/org.ab.x48.txt
+++ b/metadata/org.ab.x48.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/shagr4th/droid48
 Source Code:https://github.com/shagr4th/droid48
diff --git a/metadata/org.abrantix.rockon.rockonnggl.txt b/metadata/org.abrantix.rockon.rockonnggl.txt
index 1cb9cb2221..59a0238fb2 100644
--- a/metadata/org.abrantix.rockon.rockonnggl.txt
+++ b/metadata/org.abrantix.rockon.rockonnggl.txt
@@ -1,6 +1,6 @@
 Disabled:Non-free binaries
 Name:Cubed
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://abrantix.org/3.php
 Source Code:http://github.com/fabrantes/rockonnggl
diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 525fd6dc14..b946017fef 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/adaway
 Source Code:https://github.com/dschuermann/ad-away
@@ -6,6 +6,7 @@ Issue Tracker:https://github.com/dschuermann/ad-away/issues
 Donate:http://sufficientlysecure.org/index.php/adaway
 FlattrID:369138
 
+Provides:org.sufficientlysecure.adaway
 Auto Name:AdAway
 Summary:Block advertisements
 Description:
diff --git a/metadata/org.adblockplus.android.txt b/metadata/org.adblockplus.android.txt
index d6d2dbfa74..f6be53e430 100644
--- a/metadata/org.adblockplus.android.txt
+++ b/metadata/org.adblockplus.android.txt
@@ -1,5 +1,5 @@
 AntiFeatures:Tracking,Ads
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://adblockplus.org/en/android
 Source Code:https://hg.adblockplus.org/adblockplusandroid
@@ -41,45 +41,91 @@ just within Firefox and no other app is needed.
 Repo Type:hg
 Repo:https://hg.adblockplus.org/adblockplusandroid
 
-Build Version:1.0.1,168,1.0.1,srclibs=RootTools@211,\
-init=rm -rf iptables/ libs/RootTools-1.7.jar build.xml && \
-git clone https://android.googlesource.com/platform/external/iptables,prebuild=\
-echo "source.dir=src;$$RootTools$$/src" >> ant.properties && cd iptables && \
-git apply ../iptables.patch && sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
-make fixextensions build && mv libs/armeabi/iptables ../assets/install/,buildjni=yes
-Build Version:1.1,238,1.1,srclibs=RootTools@211,\
-update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport,\
-init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
-git clone https://android.googlesource.com/platform/external/iptables,prebuild=\
-echo "source.dir=src;$$RootTools$$/src" >> ant.properties && cd iptables && \
-git apply ../iptables.patch && sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
-make fixextensions build && mv libs/armeabi/iptables ../assets/install/,buildjni=yes
-Build Version:1.1.1,248,1.1.1,srclibs=RootTools@211,\
-update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport,\
-init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
-git clone https://android.googlesource.com/platform/external/iptables,prebuild=\
-echo "source.dir=src;$$RootTools$$/src" >> ant.properties && cd iptables && \
-git apply ../iptables.patch && sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
-make fixextensions build && mv libs/armeabi/iptables ../assets/install/,buildjni=yes
-Build Version:1.1.2,253,1.1.2,\
-srclibs=RootTools@211;iptables@android-4.2.2_r1,prebuild=\
-rm libs/RootTools-1.7.jar && cp -r $$iptables$$ . && \
-echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
-cd iptables && git apply ../iptables.patch && \
-python extensions/fixinit.py,build=cd iptables && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../assets/install/,buildjni=no
-Build Version:1.1.3,270,1.1.3,\
-srclibs=RootTools@211;iptables@android-4.2.2_r1,prebuild=\
-rm libs/RootTools-1.7.jar && cp -r $$iptables$$ . && \
-echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
-cd iptables && git apply ../iptables.patch && \
-python extensions/fixinit.py,build=cd iptables && \
-$$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
-mv libs/armeabi/iptables ../assets/install/,buildjni=no
+Build:1.0.1,168
+    commit=1.0.1
+    init=rm -rf iptables/ libs/RootTools-1.7.jar build.xml && \
+        git clone https://android.googlesource.com/platform/external/iptables
+    srclibs=RootTools@211
+    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
+        make fixextensions build && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=yes
+
+Build:1.1,238
+    commit=1.1
+    init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
+        git clone https://android.googlesource.com/platform/external/iptables
+    update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
+    srclibs=RootTools@211
+    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
+        make fixextensions build && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=yes
+
+Build:1.1.1,248
+    commit=1.1.1
+    init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
+        git clone https://android.googlesource.com/platform/external/iptables
+    update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
+    srclibs=RootTools@211
+    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
+        make fixextensions build && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=yes
+
+Build:1.1.2,253
+    commit=1.1.2
+    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    prebuild=rm libs/RootTools-1.7.jar && \
+        cp -r $$iptables$$ . && \
+        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        python extensions/fixinit.py
+    build=cd iptables && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=no
+
+Build:1.1.3,270
+    commit=1.1.3
+    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    prebuild=rm libs/RootTools-1.7.jar && \
+        cp -r $$iptables$$ . && \
+        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        python extensions/fixinit.py
+    build=cd iptables && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=no
+
+Build:1.1.4,286
+    commit=1.1.4
+    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    prebuild=rm libs/RootTools-1.7.jar && \
+        cp -r $$iptables$$ . && \
+        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        cd iptables && \
+        git apply ../iptables.patch && \
+        python extensions/fixinit.py
+    build=cd iptables && \
+        $$NDK$$/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk && \
+        mv libs/armeabi/iptables ../assets/install/
+    buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.1.3
-Current Version Code:270
+Current Version:1.2
+Current Version Code:307
 
diff --git a/metadata/org.addhen.smssync.txt b/metadata/org.addhen.smssync.txt
index 659f83f6a8..3ddf6a146d 100644
--- a/metadata/org.addhen.smssync.txt
+++ b/metadata/org.addhen.smssync.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:LGPL
 Web Site:http://smssync.ushahidi.com/
 Source Code:https://github.com/ushahidi/SMSSync
@@ -15,16 +15,39 @@ SMS' that don't include a secret and to identify the sender.
 Repo Type:git
 Repo:https://github.com/ushahidi/SMSSync.git
 
-Build Version:1.1.9,11,42478d1ac,target=android-4,rm=tests/bin/smssyncTest.apk
-Build Version:2.0.0,12,v2.0.0,subdir=smssync,update=.;../abslib,target=android-16,prebuild=\
-rm -rf tests gen
-Build Version:2.0.2,14,v2.0.2,subdir=smssync,update=.;../abslib,target=android-16,prebuild=\
-rm -rf tests gen
-Build Version:2.3,15,v2.3,subdir=smssync,update=.;../abslib,target=android-16
-Build Version:2.4,18,!uses google analytics at v2.4,subdir=smssync,gradle=yes
+Build:1.1.9,11
+    commit=42478d1ac
+    target=android-4
+    rm=tests/bin/smssyncTest.apk
+
+Build:2.0.0,12
+    commit=v2.0.0
+    subdir=smssync
+    target=android-16
+    update=.;../abslib
+    prebuild=rm -rf tests gen
+
+Build:2.0.2,14
+    commit=v2.0.2
+    subdir=smssync
+    target=android-16
+    update=.;../abslib
+    prebuild=rm -rf tests gen
+
+Build:2.3,15
+    commit=v2.3
+    subdir=smssync
+    target=android-16
+    update=.;../abslib
+
+Build:2.5.1,20
+    commit=v2.5.1
+    subdir=smssync
+    gradle=noAnalytics
+	scandelete=smssync/libs
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.4
-Current Version Code:18
+Current Version:2.5.1
+Current Version Code:20
 
diff --git a/metadata/org.adw.launcher.txt b/metadata/org.adw.launcher.txt
index 775c2a7e3d..5e0a3c32c5 100644
--- a/metadata/org.adw.launcher.txt
+++ b/metadata/org.adw.launcher.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/AnderWeb/android_packages_apps_Launcher
 Source Code:https://github.com/AnderWeb/android_packages_apps_Launcher
diff --git a/metadata/org.aja.flightmode.txt b/metadata/org.aja.flightmode.txt
index ba80694ebb..21e85ef0a9 100644
--- a/metadata/org.aja.flightmode.txt
+++ b/metadata/org.aja.flightmode.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:WTFPL
 Web Site:http://ajaapps.github.io/flightmode/
 Source Code:https://github.com/ajaapps/flightmode
diff --git a/metadata/org.ale.openwatch.txt b/metadata/org.ale.openwatch.txt
index fcc6b98fee..adced55824 100644
--- a/metadata/org.ale.openwatch.txt
+++ b/metadata/org.ale.openwatch.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:http://openwatch.net
 Source Code:https://github.com/Miserlou/OpenWatch---Android
diff --git a/metadata/org.ale.scanner.zotero.txt b/metadata/org.ale.scanner.zotero.txt
index 7cb5e512ab..03f85eb87d 100644
--- a/metadata/org.ale.scanner.zotero.txt
+++ b/metadata/org.ale.scanner.zotero.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/jmschanck/Scanner-For-Zotero
 Source Code:https://github.com/jmschanck/Scanner-For-Zotero
diff --git a/metadata/org.ametro.txt b/metadata/org.ametro.txt
index 9fdfadf404..2e9ff8f621 100644
--- a/metadata/org.ametro.txt
+++ b/metadata/org.ametro.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3+
 Web Site:http://www.ametro.org/
-Source Code:http://code.google.com/p/ametro/source/checkout
-Issue Tracker:http://code.google.com/p/ametro/issues/list
+Source Code:http://code.google.com/p/ametro/source
+Issue Tracker:http://code.google.com/p/ametro/issues
 Donate:http://www.ametro.org/donate
 
 Auto Name:aMetro
@@ -27,8 +27,7 @@ Build Version:1.1.4,16,488,subdir=workspace/aMetro
 Build Version:1.1.5,17,489,subdir=workspace/aMetro
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.4
-Current Version Code:16
+Update Check Mode:RepoManifest
+Current Version:1.1.5
+Current Version Code:17
 
diff --git a/metadata/org.andglkmod.hunkypunk.txt b/metadata/org.andglkmod.hunkypunk.txt
index d6f136f5f6..dbd26c3425 100644
--- a/metadata/org.andglkmod.hunkypunk.txt
+++ b/metadata/org.andglkmod.hunkypunk.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/hunkypunk
-Source Code:http://code.google.com/p/hunkypunk/source/list
-Issue Tracker:http://code.google.com/p/hunkypunk/issues/list
+Source Code:http://code.google.com/p/hunkypunk/source
+Issue Tracker:http://code.google.com/p/hunkypunk/issues
 
 Auto Name:Hunky Punk
 Summary:Interactive fiction player
diff --git a/metadata/org.androhid.txt b/metadata/org.androhid.txt
index 6c278a7e4a..1c59d6da56 100644
--- a/metadata/org.androhid.txt
+++ b/metadata/org.androhid.txt
@@ -1,8 +1,9 @@
+Disabled:Still not buildable, no code updates for three years
 Category:System
 License:GPLv3
 Web Site:https://code.google.com/p/androhid/
-Source Code:https://code.google.com/p/androhid/source/browse/
-Issue Tracker:https://code.google.com/p/androhid/issues/list
+Source Code:https://code.google.com/p/androhid/source
+Issue Tracker:https://code.google.com/p/androhid/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6R56TQAX8GTVQ
 
 Auto Name:AndroHid
@@ -17,7 +18,7 @@ systems you don't have to install any further software on the host.
 #Why?
 Requires Root:Yes
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://androhid.googlecode.com/svn/trunk/
 
 Auto Update Mode:None
diff --git a/metadata/org.androidappdev.batterywidget.txt b/metadata/org.androidappdev.batterywidget.txt
index bc212486bc..a215f2eef4 100644
--- a/metadata/org.androidappdev.batterywidget.txt
+++ b/metadata/org.androidappdev.batterywidget.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv3
 Web Site:https://github.com/hmrocha/batterywidget
 Source Code:https://github.com/hmrocha/batterywidget
@@ -16,8 +16,7 @@ Repo:https://github.com/hmrocha/batterywidget.git
 Build Version:0.6.2,13,7700115,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.6.2
 Current Version Code:13
 
diff --git a/metadata/org.androidappdev.wifiwidget.txt b/metadata/org.androidappdev.wifiwidget.txt
index 38353dd2c1..797a5ad4a6 100644
--- a/metadata/org.androidappdev.wifiwidget.txt
+++ b/metadata/org.androidappdev.wifiwidget.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://androidappdev.org
 Source Code:https://github.com/hmrocha/wifiwidget
@@ -17,8 +17,7 @@ Repo:https://github.com/hmrocha/wifiwidget.git
 Build Version:1.0,3,90d18ed007,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:3
 
diff --git a/metadata/org.androidsoft.app.permission.txt b/metadata/org.androidsoft.app.permission.txt
index ce0103efe6..c78faef376 100644
--- a/metadata/org.androidsoft.app.permission.txt
+++ b/metadata/org.androidsoft.app.permission.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://www.androidsoft.org/
-Source Code:http://code.google.com/p/androidsoft/source/browse/trunk/permission
-Issue Tracker:https://code.google.com/p/androidsoft/issues/list
+Source Code:http://code.google.com/p/androidsoft/source
+Issue Tracker:https://code.google.com/p/androidsoft/issues
 
 Auto Name:Permission Friendly Apps
 Summary:Rank apps by permissions
@@ -10,17 +10,25 @@ Description:
 Gives a rating to each app, based on how much influence they can have.
 .
 
-Repo Type:svn
-Repo:https://androidsoft.googlecode.com/svn/trunk/permission/
+Repo Type:srclib
+Repo:AndroidSoft
 
-Build Version:1.4.1,12,64,prebuild=rm -rf releases,target=android-15
-Build Version:1.4.2,13,66,prebuild=rm -rf releases,target=android-15
+Build:1.4.1,12
+    commit=64
+    target=android-15
+    subdir=permission
+    prebuild=rm -rf releases
+
+Build:1.4.2,13
+    commit=66
+    target=android-15
+    subdir=permission
+    prebuild=rm -rf releases
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.4.2.1
-Current Version Code:14
+Update Check Mode:RepoManifest
+Current Version:1.4.2
+Current Version Code:13
 
 No Source Since:1.4.2.1
 
diff --git a/metadata/org.androidsoft.coloring.txt b/metadata/org.androidsoft.coloring.txt
index 5b9d163726..85f95e30bd 100644
--- a/metadata/org.androidsoft.coloring.txt
+++ b/metadata/org.androidsoft.coloring.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Children
 License:GPLv3+
 Web Site:http://androidsoft.org
 Source Code:http://androidsoft.googlecode.com/svn/trunk/coloring/
@@ -10,15 +10,13 @@ Description:
 No description available
 .
 
-Repo Type:git-svn
-Repo:http://androidsoft.googlecode.com/svn/trunk/coloring/
+Repo Type:srclib
+Repo:AndroidSoft
 
-#Don't have android-11
-Build Version:1.0.0,1,50,prebuild=rm -rf releases,target=android-15
+Build Version:1.0.0,1,50,subdir=coloring,prebuild=rm -rf releases,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.0
 Current Version Code:1
 
diff --git a/metadata/org.androidsoft.games.memory.kids.txt b/metadata/org.androidsoft.games.memory.kids.txt
index 4a9e42b62d..d525fa95cb 100644
--- a/metadata/org.androidsoft.games.memory.kids.txt
+++ b/metadata/org.androidsoft.games.memory.kids.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:http://androidsoft.org
-Source Code:https://code.google.com/p/androidsoft/source/checkout
-Issue Tracker:https://code.google.com/p/androidsoft/issues/list
+Source Code:https://code.google.com/p/androidsoft/source
+Issue Tracker:https://code.google.com/p/androidsoft/issues
 
 Auto Name:"Memory"
 Summary:Memory game for kids
@@ -10,11 +10,11 @@ Description:
 A memory game for kids.
 .
 
-Repo Type:git-svn
-Repo:http://androidsoft.googlecode.com/svn;trunk=trunk/memory;tags=tags
+Repo Type:srclib
+Repo:AndroidSoft
 
-Build Version:1.8.0,13,44,prebuild=rm -rf releases && rm libs/androidsoft-credits-1.0.0.jar,target=android-11
-Build Version:1.9.0,14,61,prebuild=rm -rf releases && rm libs/androidsoft-credits-1.0.0.jar,target=android-11
+Build Version:1.8.0,13,44,subdir=memory,prebuild=rm -rf releases && rm libs/androidsoft-credits-1.0.0.jar,target=android-11
+Build Version:1.9.0,14,61,subdir=memory,prebuild=rm -rf releases && rm libs/androidsoft-credits-1.0.0.jar,target=android-11
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/org.androidsoft.games.slowit.txt b/metadata/org.androidsoft.games.slowit.txt
index a40666aea7..599255a025 100644
--- a/metadata/org.androidsoft.games.slowit.txt
+++ b/metadata/org.androidsoft.games.slowit.txt
@@ -1,8 +1,8 @@
-Category:Games;Children
+Categories:Games,Children
 License:GPLv3
 Web Site:http://www.androidsoft.org/
-Source Code:http://code.google.com/p/androidsoft/source/browse/trunk/SlowIt
-Issue Tracker:https://code.google.com/p/androidsoft/issues/list
+Source Code:http://code.google.com/p/androidsoft/source
+Issue Tracker:https://code.google.com/p/androidsoft/issues
 
 Auto Name:Slow It!
 Summary:Simple game
@@ -14,16 +14,18 @@ Designed for children.
 Repo Type:srclib
 Repo:AndroidSoft
 
-Build Version:2.0,10,75,forceversion=yes,subdir=SlowIt,\
-extlibs=android/android-support-v13.jar,prebuild=rm -rf libs/* && \
-rm -rf $(find .. -name releases) && cd ../ && \
-echo "source.dir=$PWD/SlowIt/src;$PWD/libs/Credits/src;\
-$PWD/libs/Utils/src" > SlowIt/ant.properties
+Build:2.0,10
+    commit=75
+    subdir=SlowIt
+    forceversion=yes
+    extlibs=android/android-support-v13.jar
+    prebuild=rm -rf libs/* && \
+        rm -rf $(find .. -name releases) && \
+        cd ../ && \
+        echo "source.dir=$PWD/SlowIt/src;$PWD/libs/Credits/src;$PWD/libs/Utils/src" > SlowIt/ant.properties
 
 Auto Update Mode:None
-# Bug in RM for srclibs
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.0
+Update Check Mode:RepoManifest
+Current Version:2.0 
 Current Version Code:10
 
diff --git a/metadata/org.andstatus.app.txt b/metadata/org.andstatus.app.txt
index 80dc5b366e..2a3f2ce159 100644
--- a/metadata/org.andstatus.app.txt
+++ b/metadata/org.andstatus.app.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://andstatus.org/
 Source Code:https://github.com/andstatus/andstatus
@@ -7,9 +7,13 @@ Issue Tracker:https://github.com/andstatus/andstatus/issues
 Auto Name:AndStatus
 Summary:Light-weight Microblogger
 Description:
-Andstatus is a client for microblogging services such as Twitter, Identi.ca
-and pump.io. It allows you to read messages, send status updates and create
-favorites, even when you are offline.
+Andstatus is a lightweight microblogging client, supporting Twitter, statusnet
+and pump.io (including identi.ca). It allows you to read messages, send status
+updates and create favorites, even when you are offline.
+
+It features multiple User accounts in all supported Microblogging systems and
+allows you to work offline, including reading and sending messages while you
+are offline
 
 Messages can be stored on the local storage indefinitely and the search option
 is limited to that.
@@ -18,23 +22,89 @@ is limited to that.
 Repo Type:git
 Repo:git://github.com/andstatus/andstatus.git
 
-# needs to adapt src/org/andstatus/app/net/OAuthKeys.java
-#Build Version:1.2.4,48,9dba38c8d77fe8068564b88c197fb60ec64b60a3,target=android-3
-Build Version:1.9.1,61,92a6933279,extlibs=android/android-support-v4.jar,target=android-15
-Build Version:1.10.0,62,eb0a0fb51c,extlibs=android/android-support-v4.jar,target=android-15
-Build Version:1.10.2,64,!not a release
-Build Version:1.11.4,69,2e3325dd77,extlibs=android/android-support-v4.jar,target=android-15
-Build Version:1.12.0,70,AndStatus-1.12.0,extlibs=android/android-support-v4.jar,target=android-15
-Build Version:1.13.1,72,AndStatus-1.13.1,extlibs=android/android-support-v4.jar,target=android-15
-Build Version:1.14.0,73,AndStatus-1.14.0,extlibs=android/android-support-v4.jar
-Build Version:1.15.1,75,AndStatus-1.15.1,extlibs=android/android-support-v4.jar
-Build Version:1.16.0,77,AndStatus-1.16.0,extlibs=android/android-support-v4.jar
-Build Version:1.17.0,78,AndStatus-1.17.0,extlibs=android/android-support-v4.jar
-Build Version:1.17.1,79,AndStatus-1.17.1,extlibs=android/android-support-v4.jar
-Build Version:1.18.1,81,AndStatus-1.18.1,extlibs=android/android-support-v4.jar
+Build:1.9.1,61
+    commit=92a6933279
+    target=android-15
+    extlibs=android/android-support-v4.jar
+
+Build:1.10.0,62
+    commit=eb0a0fb51c
+    target=android-15
+    extlibs=android/android-support-v4.jar
+
+Build:1.10.2,64
+    disable=not a release
+    commit=unknown - see disabled
+
+Build:1.11.4,69
+    commit=2e3325dd77
+    target=android-15
+    extlibs=android/android-support-v4.jar
+
+Build:1.12.0,70
+    commit=AndStatus-1.12.0
+    target=android-15
+    extlibs=android/android-support-v4.jar
+
+Build:1.13.1,72
+    commit=AndStatus-1.13.1
+    target=android-15
+    extlibs=android/android-support-v4.jar
+
+Build:1.14.0,73
+    commit=AndStatus-1.14.0
+    extlibs=android/android-support-v4.jar
+
+Build:1.15.1,75
+    commit=AndStatus-1.15.1
+    extlibs=android/android-support-v4.jar
+
+Build:1.16.0,77
+    commit=AndStatus-1.16.0
+    extlibs=android/android-support-v4.jar
+
+Build:1.17.0,78
+    commit=AndStatus-1.17.0
+    extlibs=android/android-support-v4.jar
+
+Build:1.17.1,79
+    commit=AndStatus-1.17.1
+    extlibs=android/android-support-v4.jar
+
+Build:1.18.1,81
+    commit=AndStatus-1.18.1
+    extlibs=android/android-support-v4.jar
+
+Build:2.0,83
+    commit=AndStatus-2.0
+    extlibs=android/android-support-v4.jar
+
+Build:2.1,84
+    commit=AndStatus-2.1
+    extlibs=android/android-support-v4.jar
+
+Build:3.0,85
+    commit=AndStatus-3.0
+    extlibs=android/android-support-v4.jar
+
+Build:4.0,86
+    commit=AndStatus-4.0
+    extlibs=android/android-support-v4.jar
+
+Build:5.1,89
+    commit=AndStatus-5.1
+    extlibs=android/android-support-v4.jar
+
+Build:6.1,91
+    commit=AndStatus-6.1
+    extlibs=android/android-support-v4.jar
+
+Maintainer Notes:
+Beware disappearing tags.
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.18.1
-Current Version Code:81
+Current Version:6.1
+Current Version Code:91
 
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index 23145311d2..f060255475 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:http://aprsdroid.org
 Source Code:https://github.com/ge0rg/aprsdroid
diff --git a/metadata/org.ardour.txt b/metadata/org.ardour.txt
index 0728cd5cea..a07d15d86e 100644
--- a/metadata/org.ardour.txt
+++ b/metadata/org.ardour.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://ardour.org
 Source Code:http://subversion.ardour.org/svn/thirdparty/ardroid
diff --git a/metadata/org.balau.fakedawn.txt b/metadata/org.balau.fakedawn.txt
index 4f8c7d9e43..c9fdb5c2df 100644
--- a/metadata/org.balau.fakedawn.txt
+++ b/metadata/org.balau.fakedawn.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://code.google.com/p/fakedawn/
-Source Code:http://code.google.com/p/fakedawn/source/list
-Issue Tracker:http://code.google.com/p/fakedawn/issues/list
+Source Code:http://code.google.com/p/fakedawn/source
+Issue Tracker:http://code.google.com/p/fakedawn/issues
 
 Auto Name:Fake Dawn
 Summary:Gentle alarm clock
diff --git a/metadata/org.bc_bd.mrwhite.txt b/metadata/org.bc_bd.mrwhite.txt
index 91f5f8b42e..c56e42f965 100644
--- a/metadata/org.bc_bd.mrwhite.txt
+++ b/metadata/org.bc_bd.mrwhite.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:http://bc-bd.org/blog/mrwhite-a-poor-mans-torch/
-Source Code:git://bc-bd.org/git/mrwhite.git
+Source Code:
 Issue Tracker:
 
 Auto Name:MrWhite
diff --git a/metadata/org.beide.bomber.txt b/metadata/org.beide.bomber.txt
index d0f73b224a..bc8a3f9a16 100644
--- a/metadata/org.beide.bomber.txt
+++ b/metadata/org.beide.bomber.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:
 Source Code:https://github.com/beide/Bomber-for-android
@@ -6,7 +6,7 @@ Issue Tracker:https://github.com/beide/Bomber-for-android/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=kees%40huibertsbloembollen%2enl&lc=NL&item_name=Sophie%27s%20software&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
 
 Auto Name:Bomber
-Summary:Single player arcade game.
+Summary:Single player arcade game
 Description:
 Bomber is a single player arcade game. The player is invading various cities in a
 plane that is decreasing in height.
diff --git a/metadata/org.beide.droidgain.txt b/metadata/org.beide.droidgain.txt
index 9940e53a6b..bd0dafcc49 100644
--- a/metadata/org.beide.droidgain.txt
+++ b/metadata/org.beide.droidgain.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:
 Source Code:https://github.com/beide/Droidgain
diff --git a/metadata/org.billthefarmer.accordion.txt b/metadata/org.billthefarmer.accordion.txt
index 2822551712..0231e906eb 100644
--- a/metadata/org.billthefarmer.accordion.txt
+++ b/metadata/org.billthefarmer.accordion.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/billthefarmer/accordion/wiki
 Source Code:https://github.com/billthefarmer/accordion
diff --git a/metadata/org.billthefarmer.melodeon.txt b/metadata/org.billthefarmer.melodeon.txt
index 34c78c0d31..ef3d216e47 100644
--- a/metadata/org.billthefarmer.melodeon.txt
+++ b/metadata/org.billthefarmer.melodeon.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/billthefarmer/melodeon/wiki
 Source Code:https://github.com/billthefarmer/melodeon
diff --git a/metadata/org.billthefarmer.tuner.txt b/metadata/org.billthefarmer.tuner.txt
index 3b36086098..caf2368aca 100644
--- a/metadata/org.billthefarmer.tuner.txt
+++ b/metadata/org.billthefarmer.tuner.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/billthefarmer/tuner/wiki
 Source Code:https://github.com/billthefarmer/tuner
diff --git a/metadata/org.birthdayadapter.txt b/metadata/org.birthdayadapter.txt
index 87ae46247f..3fc52b5d13 100644
--- a/metadata/org.birthdayadapter.txt
+++ b/metadata/org.birthdayadapter.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/android-apps/#birthday
 Source Code:https://github.com/dschuermann/birthday-adapter
diff --git a/metadata/org.blockinger.game.txt b/metadata/org.blockinger.game.txt
index 95862f6279..afbec53a52 100644
--- a/metadata/org.blockinger.game.txt
+++ b/metadata/org.blockinger.game.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/vocollapse/Blockinger
diff --git a/metadata/org.bombusmod.txt b/metadata/org.bombusmod.txt
index b70e062cb7..7a6e3c6706 100644
--- a/metadata/org.bombusmod.txt
+++ b/metadata/org.bombusmod.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:http://bombusmod.net.ru
-Source Code:http://code.google.com/p/bm2/source/list
-Issue Tracker:http://code.google.com/p/bm2/issues/list
+Source Code:http://code.google.com/p/bm2/source
+Issue Tracker:http://code.google.com/p/bm2/issues
 
 Auto Name:BombusMod
 Summary:Messaging client
diff --git a/metadata/org.brandroid.openmanager.txt b/metadata/org.brandroid.openmanager.txt
index d9ab900fea..035a1438f7 100644
--- a/metadata/org.brandroid.openmanager.txt
+++ b/metadata/org.brandroid.openmanager.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://brandroid.org/open/
 #Don't link to fdroid branch as GitHub clients don't like it
@@ -12,14 +12,14 @@ Description:
 Open Explorer – file manager for all devices! (Tablets, Phones, Google TVs,
 sandwiches!)
 
-*Complete file system management
-*USB, SD and other external media
-*Network connectable (FTP, SFTP, SMB/Samba/Windows/Lan/WIFI)
-*Text Editor (Tabbed, Multiple Document Interface)
-*Smart Folders that scan for different types of media (Videos, Photos, Music, Downloads)
-*View Pager directory navigation (swipe right to go up a directory)
-*Superuser/Root ability to list/read system folders (no system write yet)
-*More features like offline file structure cache, more Networking capability and Disk space heat map to come.
+* Complete file system management
+* USB, SD and other external media
+* Network connectable (FTP, SFTP, SMB/Samba/Windows/Lan/WIFI)
+* Text Editor (Tabbed, Multiple Document Interface)
+* Smart Folders that scan for different types of media (Videos, Photos, Music, Downloads)
+* View Pager directory navigation (swipe right to go up a directory)
+* Superuser/Root ability to list/read system folders (no system write yet)
+* More features like offline file structure cache, more Networking capability and Disk space heat map to come.
 
 The source code for our build is in a branch called fdroid.
 .
diff --git a/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
index 878ad57aaa..c196753ea9 100644
--- a/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
+++ b/metadata/org.broeuschmeul.android.gps.bluetooth.provider.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://sourceforge.net/p/bluegps4droid/
 Source Code:http://sourceforge.net/p/bluegps4droid/git
diff --git a/metadata/org.chrisbailey.todo.txt b/metadata/org.chrisbailey.todo.txt
new file mode 100644
index 0000000000..c17635cd2f
--- /dev/null
+++ b/metadata/org.chrisbailey.todo.txt
@@ -0,0 +1,26 @@
+Categories:Office
+License:GPLv3
+Web Site:https://github.com/chrispbailey/ToDo-List-Widget
+Source Code:https://github.com/chrispbailey/ToDo-List-Widget
+Issue Tracker:https://github.com/chrispbailey/ToDo-List-Widget/issues
+
+Summary:Todo List Widget
+Description:
+A simple todo list widget.
+
+Newer versions are available elsewhere, but no source code is published for
+those.
+.
+
+Repo Type:git
+Repo:https://github.com/chrispbailey/ToDo-List-Widget.git
+
+Build:1.7.1,10
+    commit=f52f34d6
+    target=android-18
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.7.1
+Current Version Code:10
+
diff --git a/metadata/org.congresointeractivo.elegilegi.txt b/metadata/org.congresointeractivo.elegilegi.txt
new file mode 100644
index 0000000000..b3913cbdf2
--- /dev/null
+++ b/metadata/org.congresointeractivo.elegilegi.txt
@@ -0,0 +1,23 @@
+Category:Games
+License:GPLv3
+Web Site:
+Source Code:https://github.com/congresointeractivo/elegilegimobile
+Issue Tracker:https://github.com/congresointeractivo/elegilegimobile/issues
+
+Auto Name:ElegiLegi
+Summary:Open government game for Argentina
+Description:
+Status: Alpha/Beta
+.
+
+Repo Type:git
+Repo:https://github.com/congresointeractivo/elegilegimobile.git
+
+Build Version:0.0.1,1,83fe313,subdir=platforms/android,\
+prebuild=sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.0.1
+Current Version Code:1
+
diff --git a/metadata/org.connectbot.txt b/metadata/org.connectbot.txt
index 0d2109183d..456c2e9d1b 100644
--- a/metadata/org.connectbot.txt
+++ b/metadata/org.connectbot.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:Apache2
-Web Site:http://code.google.com/p/connectbot/
-Source Code:https://code.google.com/p/connectbot
-Issue Tracker:http://code.google.com/p/connectbot/issues/list
+Web Site:http://code.google.com/p/connectbot
+Source Code:https://code.google.com/p/connectbot/source
+Issue Tracker:http://code.google.com/p/connectbot/issues
 
 Auto Name:ConnectBot
 Summary:SSH and local shell client
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index 9246837493..9f11858e45 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv2
 Web Site:http://crengine.sourceforge.net
 Source Code:http://sourceforge.net/p/crengine/crengine/ci/master/tree
@@ -6,7 +6,7 @@ Issue Tracker:http://sourceforge.net/tracker/?group_id=191284
 Donate:http://sourceforge.net/project/project_donations.php?group_id=191284
 
 Auto Name:Cool Reader
-Summary:E-book reader.
+Summary:E-book reader
 Description:
 An e-book reader. Supported formats: FB2, TXT, RTF, TCR, HTML, EPUB, CHM.
 Browse free books online and add your own OPDS shares.
@@ -20,57 +20,298 @@ Repo Type:git
 Repo:git://crengine.git.sourceforge.net/gitroot/crengine/crengine
 
 #Has a conflicting (and invalid) target in build.properties - remove it
-Build Version:3.0.39-35,60,68ad007ac1272ef322fd61cb6591618723422380,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.40-1,64,cr3.0.40-1,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.40-6,69,cr3.0.40-6,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.41-3,75,cr3.0.41-3,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.41-9,81,cr3.0.41-9,subdir=android,rm=android/build.properties,buildjni=yes
+Build:3.0.39-35,60
+    commit=68ad007ac1272ef322fd61cb6591618723422380
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.40-1,64
+    commit=cr3.0.40-1
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.40-6,69
+    commit=cr3.0.40-6
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.41-3,75
+    commit=cr3.0.41-3
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.41-9,81
+    commit=cr3.0.41-9
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
 #Note: 3.0.42-3 is untagged in the repo, and the source does not compile at what would
 #appear to be the corresponding commit.
-Build Version:3.0.42-6,86,cr3.0.42-6,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.43-4,94,cr3.0.43-4,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.43-6,96,cr3.0.43-6,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.44-03,103,cr3.0.44-3,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.44-09,109,cr3.0.44-9,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.45-04,114,!tag points to wrong version,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.45-09,119,!tag points to wrong version,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.45-11,121,6c42a9b65090da9640ccb6ee317bb32de24201fb,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.45-14,124,cr3.0.45-14,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.46-1,131,cr3.0.46-1,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.46-1,131,cr3.0.46-1,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.46-5,135,cr3.0.46-5,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.46-11,141,cr3.0.46-11,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.48-5,155,cr3.0.48-5,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.49-2,162,cr3.0.49-2,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.49-5,165,cr3.0.49-5,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.49-9,169,cr3.0.49-9,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.49-16,176,cr3.0.49-16,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.51-7,197,cr3.0.51-7,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.52-1,241,cr3.0.52-1,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.52-4,244,cr3.0.52-4,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.53-3,247,cr3.0.53-3,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.53-10,255,cr3.0.53-10,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.53-14,259,cr3.0.53-14,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.53-18,263,c555ecd66d18b218fb255733c8b33a0825992f76,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.53-19,264,cr3.0.53-19,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.54-5,275,cr3.0.54-5,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.54-9,279,cr3.0.54-9,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.54-33,303,cr3.0.54-33,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.54-38,308,cr3.0.54-38,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.54-47,447,cr3.0.54-47,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.55-5,505,cr3.0.55-5,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.55-9,509,cr3.0.55-9,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.55-14,514,cr3.0.55-14,subdir=android,rm=android/build.properties,buildjni=yes
-Build Version:3.0.55-30,530,cr3.0.55-30,subdir=android,rm=android/ant.properties,buildjni=yes
-Build Version:3.0.55-32,532,cr3.0.55-32,subdir=android,rm=android/ant.properties,buildjni=yes
-Build Version:3.0.56-5,565,!builds ok but crashes at cr3.0.56-5,subdir=android,rm=android/ant.properties,buildjni=yes,target=android-14
-Build Version:3.0.57-15,625,!builds ok but crashes at cr3.0.57-15,subdir=android,rm=android/ant.properties,buildjni=yes,target=android-14
-Build Version:3.0.57-16,626,!builds ok but crashes at 2f3d5fb86df316d,subdir=android,rm=android/ant.properties,buildjni=yes,target=android-14
-Build Version:3.1.2-27,847,cr3-3.1.2-27,subdir=android,rm=android/ant.properties,buildjni=yes,target=android-16
-Build Version:3.1.2-33,853,!ndk fails cr3-3.1.2-33,subdir=android,rm=android/ant.properties,target=android-17,buildjni=yes
+Build:3.0.42-6,86
+    commit=cr3.0.42-6
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.43-4,94
+    commit=cr3.0.43-4
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.43-6,96
+    commit=cr3.0.43-6
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.44-03,103
+    commit=cr3.0.44-3
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.44-09,109
+    commit=cr3.0.44-9
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.45-04,114
+    disable=tag points to wrong version
+    commit=unknown - see disabled
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.45-09,119
+    disable=tag points to wrong version
+    commit=unknown - see disabled
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.45-11,121
+    commit=6c42a9b65090da9640ccb6ee317bb32de24201fb
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.45-14,124
+    commit=cr3.0.45-14
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.46-1,131
+    commit=cr3.0.46-1
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.46-1,131
+    commit=cr3.0.46-1
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.46-5,135
+    commit=cr3.0.46-5
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.46-11,141
+    commit=cr3.0.46-11
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.48-5,155
+    commit=cr3.0.48-5
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.49-2,162
+    commit=cr3.0.49-2
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.49-5,165
+    commit=cr3.0.49-5
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.49-9,169
+    commit=cr3.0.49-9
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.49-16,176
+    commit=cr3.0.49-16
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.51-7,197
+    commit=cr3.0.51-7
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.52-1,241
+    commit=cr3.0.52-1
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.52-4,244
+    commit=cr3.0.52-4
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.53-3,247
+    commit=cr3.0.53-3
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.53-10,255
+    commit=cr3.0.53-10
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.53-14,259
+    commit=cr3.0.53-14
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.53-18,263
+    commit=c555ecd66d18b218fb255733c8b33a0825992f76
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.53-19,264
+    commit=cr3.0.53-19
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.54-5,275
+    commit=cr3.0.54-5
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.54-9,279
+    commit=cr3.0.54-9
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.54-33,303
+    commit=cr3.0.54-33
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.54-38,308
+    commit=cr3.0.54-38
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.54-47,447
+    commit=cr3.0.54-47
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.55-5,505
+    commit=cr3.0.55-5
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.55-9,509
+    commit=cr3.0.55-9
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.55-14,514
+    commit=cr3.0.55-14
+    subdir=android
+    rm=android/build.properties
+    buildjni=yes
+
+Build:3.0.55-30,530
+    commit=cr3.0.55-30
+    subdir=android
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.0.55-32,532
+    commit=cr3.0.55-32
+    subdir=android
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.0.56-5,565
+    disable=builds ok but crashes at cr3.0.56-5
+    commit=cr3.0.56-5
+    subdir=android
+    target=android-14
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.0.57-15,625
+    disable=builds ok but crashes at cr3.0.57-15
+    commit=cr3.0.57-15
+    subdir=android
+    target=android-14
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.0.57-16,626
+    disable=builds ok but crashes at 2f3d5fb86df316d
+    commit=2f3d5fb86df316d
+    subdir=android
+    target=android-14
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.1.2-27,847
+    commit=cr3-3.1.2-27
+    subdir=android
+    target=android-16
+    rm=android/ant.properties
+    buildjni=yes
+
+Build:3.1.2-34,854
+    disable=not building
+    commit=cr3.1.2-34
+    subdir=android
+    buildjni=yes
+
+Build:3.1.2-35,855
+    disable=no tag for this version
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:3.1.2-34
-Current Version Code:854
+Current Version:3.1.2-35
+Current Version Code:855
 
diff --git a/metadata/org.cprados.wificellmanager.txt b/metadata/org.cprados.wificellmanager.txt
new file mode 100644
index 0000000000..592fdfd1b4
--- /dev/null
+++ b/metadata/org.cprados.wificellmanager.txt
@@ -0,0 +1,35 @@
+Categories:System
+License:Apache2
+Web Site:https://sites.google.com/site/wifimaticapp
+Source Code:https://github.com/cprados/wifimatic-android
+Issue Tracker:https://github.com/cprados/wifimatic-android/issues
+
+Auto Name:Wi-Fi Matic
+Summary:Toggle WiFi based on location
+Description:
+Activates and deactivates Wi-Fi depending on your location, helping you to save battery 
+and consumption of data through your cellular network.
+
+It detects automatically the location of known Wi-Fi networks; turns on Wi-Fi 
+when you arrive a place where there is Wi-Fi, and turns it off when you leave.
+Simply turn start the app once, enable WiFi where you need to and the app will
+learn over time.
+
+It uses network location services only, which are normally provided by Google Apps
+though there is a solid replacement by NoGapps project.
+
+Of course, cellular connectivity itself is a large battery drainer and you'd be
+better off to leave the phone in Airplane mode when you can.
+.
+
+Repo Type:git
+Repo:https://github.com/cprados/wifimatic-android.git
+
+Build:1.3.5,18
+    commit=v1.3.5
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.3.5
+Current Version Code:18
+
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 75211b52c4..1b5a63fb55 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://code.google.com/p/sbautologin/
-Source Code:http://code.google.com/p/sbautologin/source/checkout
-Issue Tracker:http://code.google.com/p/sbautologin/issues/list
+Source Code:http://code.google.com/p/sbautologin/source
+Issue Tracker:http://code.google.com/p/sbautologin/issues
 
 Auto Name:sbautologin
 Summary:Autologin for Starbucks WLAN
@@ -21,7 +21,6 @@ Build Version:2.0,10,ed49e06e5e75,extlibs=junit/junit-4.10.jar
 Build Version:2.1,21,8063a3302dfc,extlibs=junit/junit-4.10.jar,forceversion=yes,forcevercode=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:2.1
 Current Version Code:21
diff --git a/metadata/org.cry.otp.txt b/metadata/org.cry.otp.txt
index 78f5f94f8b..46bed4c371 100644
--- a/metadata/org.cry.otp.txt
+++ b/metadata/org.cry.otp.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/motp/
-Source Code:http://code.google.com/p/motp/source/checkout
-Issue Tracker:http://code.google.com/p/motp/issues/list
+Source Code:http://code.google.com/p/motp/source
+Issue Tracker:http://code.google.com/p/motp/issues
 
 Auto Name:mOTP
 Summary:One-time password generator
@@ -16,8 +16,7 @@ Repo:http://motp.googlecode.com/svn/trunk/
 Build Version:1.5,20,4,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:20
 
diff --git a/metadata/org.curiouscreature.android.shelves.txt b/metadata/org.curiouscreature.android.shelves.txt
index 21116aadf3..fbe2d5557f 100644
--- a/metadata/org.curiouscreature.android.shelves.txt
+++ b/metadata/org.curiouscreature.android.shelves.txt
@@ -2,8 +2,8 @@ Disabled:Old and not much good
 Category:Reading
 License:Apache2
 Web Site:http://code.google.com/p/shelves/
-Source Code:http://code.google.com/p/shelves/source/checkout
-Issue Tracker:http://code.google.com/p/shelves/issues/list
+Source Code:http://code.google.com/p/shelves/source
+Issue Tracker:http://code.google.com/p/shelves/issues
 
 Auto Name:Shelves
 Name:Shelves
@@ -15,7 +15,7 @@ You can add books by scanning their barcodes (if you have
 information manually.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://shelves.googlecode.com/svn/trunk/Shelves
 
 Build Version:1.0,1,26,oldsdkloc=yes
diff --git a/metadata/org.cyanogenmod.oneclick.txt b/metadata/org.cyanogenmod.oneclick.txt
new file mode 100644
index 0000000000..18d19eff7c
--- /dev/null
+++ b/metadata/org.cyanogenmod.oneclick.txt
@@ -0,0 +1,30 @@
+Disabled:Non-free (no license)
+Categories:System
+License:Unknown
+Web Site:
+Source Code:https://github.com/cyngn/OneClickAndroid
+Issue Tracker:https://github.com/cyngn/OneClickAndroid/issues
+
+Auto Name:CyanogenMod Installer
+Summary:CyanogenMod Install Helper
+Description:
+OneClickAndroid has a single function – to guide users to enable "ADB", a built
+in development and debugging tool, and then navigates the user to the desktop
+installer. The desktop application then performs the installation of the
+CyanogenMod on their Android device.
+
+Antifeatures: NonFreeAdd - installer for non-Free software, and NonFreeDep -
+requires another non-free operating system to do the installation.
+.
+
+Repo Type:git
+Repo:https://github.com/cyngn/OneClickAndroid.git
+
+Build:1.0.0.9,1009
+    commit=a22278b
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.1.0
+Current Version Code:1010
+
diff --git a/metadata/org.damazio.notifier.txt b/metadata/org.damazio.notifier.txt
index 15b2bc4144..4cc3d8e6b1 100644
--- a/metadata/org.damazio.notifier.txt
+++ b/metadata/org.damazio.notifier.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/android-notifier/
-Source Code:http://code.google.com/p/android-notifier/source/checkout
-Issue Tracker:http://code.google.com/p/android-notifier/issues/list
+Source Code:http://code.google.com/p/android-notifier/source
+Issue Tracker:http://code.google.com/p/android-notifier/issues
 
 Auto Name:Android Notifier
 Summary:Mirror notifications to desktop
diff --git a/metadata/org.dgtale.icsimport.txt b/metadata/org.dgtale.icsimport.txt
new file mode 100644
index 0000000000..466ac8952e
--- /dev/null
+++ b/metadata/org.dgtale.icsimport.txt
@@ -0,0 +1,33 @@
+Categories:Office
+License:GPLv3+
+Web Site:https://github.com/danielegobbetti/ICSImport#icsimport
+Source Code:https://github.com/danielegobbetti/ICSImport
+Issue Tracker:https://github.com/danielegobbetti/ICSImport/issues
+FlattrID:2225390
+
+Auto Name:Add to calendar
+Summary:Import .ics files into calendar
+Description:
+Helper that opens files of type text/calendar and displays the "Add to
+calendar" dialog pre-populated.
+
+No permission is needed since the calendar data is not manipulated.
+
+Status: Alpha. There might still be many bugs and a lot of functionality is
+still missing. Report issues if you find any.
+.
+
+Repo Type:git
+Repo:https://github.com/danielegobbetti/ICSImport.git
+
+Build:1.0,1
+    commit=1.0
+
+Build:1.1,2
+    commit=1.1
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/org.diygenomics.pg.txt b/metadata/org.diygenomics.pg.txt
index a96547f199..19c7eb097e 100644
--- a/metadata/org.diygenomics.pg.txt
+++ b/metadata/org.diygenomics.pg.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:BSD
 Web Site:http://diygenomics.org
 Source Code:https://github.com/lablogga/DIYgenomics_Android
@@ -20,8 +20,7 @@ rm libs/FlurryAgent.jar && \
 echo "android.library.reference.1=$$FinfAgent$$" >> project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:6
 
diff --git a/metadata/org.dmfs.tasks.txt b/metadata/org.dmfs.tasks.txt
index 84d01a3dfa..7f5195b6cf 100644
--- a/metadata/org.dmfs.tasks.txt
+++ b/metadata/org.dmfs.tasks.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeAdd
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/dmfs/tasks#tasks
 Source Code:https://github.com/dmfs/tasks
diff --git a/metadata/org.dnaq.dialer2.txt b/metadata/org.dnaq.dialer2.txt
index 7e0af0e36f..73116147f3 100644
--- a/metadata/org.dnaq.dialer2.txt
+++ b/metadata/org.dnaq.dialer2.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:Apache2
 Web Site:https://bitbucket.org/dnaq/dialer2
 Source Code:https://bitbucket.org/dnaq/dialer2/src
@@ -15,11 +15,10 @@ design are the main goals of this Dialer.
 Repo Type:hg
 Repo:https://bitbucket.org/dnaq/dialer2
 
-Build Version:2.90,17,f170814ddcda
+Build Version:2.90,17,2.90
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:2.90
 Current Version Code:17
 
diff --git a/metadata/org.dolphinemu.dolphinemu.txt b/metadata/org.dolphinemu.dolphinemu.txt
index 416bb64ffc..edbd93b507 100644
--- a/metadata/org.dolphinemu.dolphinemu.txt
+++ b/metadata/org.dolphinemu.dolphinemu.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://dolphin-emu.org/
-Source Code:https://code.google.com/p/dolphin-emu/source/list
-Issue Tracker:https://code.google.com/p/droidsat/issues/list
+Source Code:https://code.google.com/p/dolphin-emu/source
+Issue Tracker:https://code.google.com/p/droidsat/issues
 
 Summary:Nintendo console emulator
 Description:
@@ -29,8 +29,10 @@ Status: ALPHA
 Repo Type:git
 Repo:https://code.google.com/p/dolphin-emu/
 
-Build Version:0.11,11,!lots of binaries need removing (at 4.0),buildjni=no,extlibs=android/android-support-v13.jar,\
-subdir=Source/Android,init=rm -r libs/* ../../Externals/msvcrt/ ../../Installer/dxredist/,\
+Build Version:0.11,11,4.0,buildjni=no,extlibs=android/android-support-v13.jar,subdir=Source/Android,\
+init=\
+  rm -r libs/* ../../Externals/msvcrt/ ../../Installer/dxredist/ && \
+  find -L ../../Externals/ -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete,\
 build=cd .. &&\
  cmake -DANDROID=True -DANDROID_NATIVE_API_LEVEL=android-14 \
  -DCMAKE_TOOLCHAIN_FILE=../Source/Android/android.toolchain.cmake \
diff --git a/metadata/org.dpadgett.timer.txt b/metadata/org.dpadgett.timer.txt
index 3d0b52346d..5c895dfc10 100644
--- a/metadata/org.dpadgett.timer.txt
+++ b/metadata/org.dpadgett.timer.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/dpadgett/Timer/
 Source Code:https://github.com/dpadgett/Timer
@@ -13,14 +13,23 @@ Stopwatch, countdown timer and world clock combined in a Holo-themed interface
 Repo Type:git
 Repo:https://github.com/dpadgett/Timer.git
 
-#Releases are in own branches
-Build Version:1.2,2,edbbc25a26,subdir=Timer,srclibs=ActionBarSherlock@6e3f2bb5,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp $$ActionBarSherlock$$/libs/android-support-v4.jar libs/
+Build:1.2,2
+    commit=edbbc25a26
+    subdir=Timer
+    srclibs=1:ActionBarSherlock@6e3f2bb5
+    prebuild=cp $$ActionBarSherlock$$/libs/android-support-v4.jar libs/
+
+Build:1.3,7
+    commit=b2f30c7428c3
+    subdir=Timer
+    srclibs=1:ActionBarSherlock@4.4.0
+
+Maintainer Notes:
+Each release on its own branch, no tags and master has an old version.
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
-Current Version:1.2
-Current Version Code:2
+Current Version:1.3
+Current Version Code:7
 
diff --git a/metadata/org.droidparts.battery_widget.txt b/metadata/org.droidparts.battery_widget.txt
index c9232c8723..bb6d526290 100644
--- a/metadata/org.droidparts.battery_widget.txt
+++ b/metadata/org.droidparts.battery_widget.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/yanchenko/droidparts-battery-widget
 Source Code:https://github.com/yanchenko/droidparts-battery-widget
diff --git a/metadata/org.droidseries.txt b/metadata/org.droidseries.txt
index f1a6c7834b..827516908a 100644
--- a/metadata/org.droidseries.txt
+++ b/metadata/org.droidseries.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/droidseries/
 Source Code:http://gitorious.org/droidseries
-Issue Tracker:http://code.google.com/p/droidseries/issues/list
+Issue Tracker:http://code.google.com/p/droidseries/issues
 
 Auto Name:DroidSeries
 Summary:TV series browser and tracker
@@ -19,8 +19,7 @@ Build Version:0.1.5-5,12,6aedbf31da874605b65eea6bbe3d4740f373672d
 Build Version:0.1.5-6,13,a72bc0a
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.1.5-6
 Current Version Code:13
 
diff --git a/metadata/org.droidupnp.txt b/metadata/org.droidupnp.txt
new file mode 100644
index 0000000000..42fad039a6
--- /dev/null
+++ b/metadata/org.droidupnp.txt
@@ -0,0 +1,24 @@
+Category:Multimedia
+License:GPLv3
+Web Site:
+Source Code:https://github.com/trishika/DroidUPnP
+Issue Tracker:https://github.com/trishika/DroidUPnP/issues
+
+Auto Name:DroidUPnP
+Summary:Play files off the network
+Description:
+Discover your home UPnP device, content provider, connected television or any 
+device controllable by UPnP and allow you to control those. 
+It also allow you to share your local content to other UPnP capable device.
+.
+
+Repo Type:git
+Repo:https://github.com/trishika/DroidUPnP.git
+
+Build Version:1.1.0,6,9d840d,maven=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1.0
+Current Version Code:6
+
diff --git a/metadata/org.dsandler.apps.markers.txt b/metadata/org.dsandler.apps.markers.txt
index 984cdccb88..122b7961a3 100644
--- a/metadata/org.dsandler.apps.markers.txt
+++ b/metadata/org.dsandler.apps.markers.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/markers-for-android/
-Source Code:http://code.google.com/p/markers-for-android/source/list
-Issue Tracker:http://code.google.com/p/markers-for-android/issues/list
+Source Code:http://code.google.com/p/markers-for-android/source
+Issue Tracker:http://code.google.com/p/markers-for-android/issues
 
 Auto Name:Markers
 Summary:Finger drawing
@@ -17,17 +17,37 @@ A tutorial on the website shows how to simulate layers.
 Repo Type:git
 Repo:https://code.google.com/p/markers-for-android/
 
-Build Version:1.0.3,36,eeabdb
-Build Version:1.0.4-beta,37,6ee885f07604
-Build Version:1.0.4,38,!Source code not published
-Build Version:1.1,39,5bef0eef0b3d
-Build Version:1.1.1,40,7ba9b6a1c590
+Build:1.0.3,36
+    commit=eeabdb
+
+Build:1.0.4-beta,37
+    commit=6ee885f07604
+
+Build:1.0.4,38
+    disable=Source code not published
+    commit=unknown - see disabled
+
+Build:1.1,39
+    commit=5bef0eef0b3d
+
+Build:1.1.1,40
+    commit=7ba9b6a1c590
+
+Build:1.2,51
+    commit=20cda81ff1a
+
+Build:1.2.1,52
+    commit=f9fa8229403
+
+Build:1.2.2,55
+    commit=151ff4a550a4
+
+Maintainer Notes:
+No tagging or clear indication of releases.
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.2
-Current Version Code:41
-
-No Source Since:1.1.2
+Update Check Mode:RepoManifest
+Current Version:1.2.2
+Current Version Code:55
 
diff --git a/metadata/org.durka.hallmonitor.txt b/metadata/org.durka.hallmonitor.txt
new file mode 100644
index 0000000000..46521055d6
--- /dev/null
+++ b/metadata/org.durka.hallmonitor.txt
@@ -0,0 +1,27 @@
+Categories:System
+License:Apache2
+Web Site:https://github.com/durka/HallMonitor
+Source Code:https://github.com/durka/HallMonitor
+Issue Tracker:https://github.com/durka/HallMonitor/issues
+
+Auto Name:Hall Monitor
+Summary:Galaxy S4 cover
+Description:
+This appreimplements some of the behaviors specific to the Samsung Galaxy S4,
+so that they can be used with alternative ROMs, such as CyanogenMod, where the
+proprietary Samsung components are not available.
+
+For more information, see upstream's [https://github.com/durka/HallMonitor/blob/master/README.md README].
+.
+
+Repo Type:git
+Repo:https://github.com/durka/HallMonitor.git
+
+Build:0.0.2a,3
+    commit=0.0.2a
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.0.2a
+Current Version Code:3
+
diff --git a/metadata/org.dynalogin.android.txt b/metadata/org.dynalogin.android.txt
index c92a13c12d..bd50520824 100644
--- a/metadata/org.dynalogin.android.txt
+++ b/metadata/org.dynalogin.android.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://www.dynalogin.org
 Source Code:https://github.com/dynalogin/dynalogin-android
diff --git a/metadata/org.dyndns.fules.ck.txt b/metadata/org.dyndns.fules.ck.txt
index 350d98bbaa..ba4e411e8a 100644
--- a/metadata/org.dyndns.fules.ck.txt
+++ b/metadata/org.dyndns.fules.ck.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:NewBSD
 Web Site:http://code.google.com/p/compass-keyboard/
-Source Code:http://code.google.com/p/compass-keyboard/source/checkout
-Issue Tracker:http://code.google.com/p/compass-keyboard/issues/list
+Source Code:http://code.google.com/p/compass-keyboard/source
+Issue Tracker:http://code.google.com/p/compass-keyboard/issues
 
 Auto Name:Compass Keyboard
 Summary:International keyboard
@@ -11,7 +11,7 @@ CompassKeyboard's main goal is to enable entering any character (including inter
 symbols of computer languages as well) with the same layouts. Default layouts support Latin- and
 Cyrillic-based and Greek character sets: user-definable external layouts are supported as well.
 For entering a plain character just swipe a key to some direction: for entering some accented ones,
-do a big swipe across the whole keyboard :) Depending on the direction of the big swipe, you can choose
+do a big swipe across the whole keyboard. Depending on the direction of the big swipe, you can choose
 different sets of accenting. For choosing a different layout, do a big swipe from the top-left corner
 of the keyboard across to bottom-down, and choose a layout from L0 to L6 (L0:Latin, L1:Cyrillic, L2:Greek,
 L3-L6:Custom). To get a visual feedback about the symbol you are about to enter, visit the entries
@@ -27,8 +27,7 @@ Build Version:v1.4,17,29
 Build Version:v1.5,19,37
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:v1.5
 Current Version Code:19
 
diff --git a/metadata/org.dyndns.ipignoli.petronius.txt b/metadata/org.dyndns.ipignoli.petronius.txt
index 6d45343dc2..558ff605b6 100644
--- a/metadata/org.dyndns.ipignoli.petronius.txt
+++ b/metadata/org.dyndns.ipignoli.petronius.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:http://code.google.com/p/petronius/wiki
-Source Code:http://code.google.com/p/petronius/source/checkout
-Issue Tracker:http://code.google.com/p/petronius/issues/list
+Source Code:http://code.google.com/p/petronius/source
+Issue Tracker:http://code.google.com/p/petronius/issues
 
 Auto Name:Petronius
 Summary:Wardrobe assistant
diff --git a/metadata/org.dyndns.sven_ola.debian_kit.txt b/metadata/org.dyndns.sven_ola.debian_kit.txt
new file mode 100644
index 0000000000..3092e53168
--- /dev/null
+++ b/metadata/org.dyndns.sven_ola.debian_kit.txt
@@ -0,0 +1,33 @@
+Categories:System
+License:GPLv3
+Web Site:http://sven-ola.dyndns.org/repo/debian-kit-en.html
+Source Code:http://sourceforge.net/p/debian-kit/code/
+Issue Tracker:http://sourceforge.net/p/debian-kit/tickets
+
+Summary:A kit to install Debian on Android devices
+Description:
+It's possible to install a complete Linux software stack on Android
+devices, e.g. by adding a chroot environment as others already have
+implemented.
+This kit does 2 things differently: firstly, it installs a Debian file
+system side-by-side to the Android file system. In order to access
+anything that’s accessible from Android also from the Debian side. And
+secondly, the Debian bootstrap is executed on the Device itself
+without any help of a larger PC, Android debugging bridge or similar.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/debian-kit/code
+
+Build:1.5.0,5
+    commit=29b8cfee2ab036cf180c2cb3dc560654c848be81
+    subdir=app
+    init=rm -rf ../kit
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.5.0
+Current Version Code:5
+
diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt
index b331110131..d81b8a4c39 100644
--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://xwords.sourceforge.net/android.php
 Source Code:http://xwords.sourceforge.net/source.php
@@ -26,26 +26,58 @@ It just means that moves wouldn't be as fast as if it were supported.
 Repo Type:git
 Repo:git://xwords.git.sourceforge.net/gitroot/xwords/xwords
 
-#Can't build this with latest sdk tools. Amongst other things, positional formatting needs
-#sorting out in the resources, but our sorter-outer can't handler multiple line strings.
-#Build Version:4.4 beta 18,11,android_beta_18,subdir=xwords4/android/XWords4,fixtrans=yes
-#Build Version:4.4 beta 23,16,!Translation files are not valid
-#Build Version:4.4 beta 26,19,!Missing resources? android_beta_26,subdir=xwords4/android/XWords4
-Build Version:4.4 beta 33,26,android_beta_33,subdir=xwords4/android/XWords4,buildjni=yes
-Build Version:4.4 beta 38,30,android_beta_38,subdir=xwords4/android/XWords4,buildjni=yes
-Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buildjni=yes,target=android-8,prebuild=cd .. && scripts/genvers.sh >ant_out.txt
-Build Version:4.4,50,android_beta_58,forceversion=yes,\
-subdir=xwords4/android/XWords4,buildjni=yes,update=force,prebuild=\
-../scripts/gen_gcmid.sh > src/org/eehouse/android/xw4/GCMConsts.java && \
-cd ../ && sed -i '/R.java/d' scripts/genvers.sh && scripts/genvers.sh XWords4 xw4 > ant_out.txt
-Build Version:4.4 beta 60,52,android_beta_60,subdir=xwords4/android/XWords4,\
-update=force,prebuild=../scripts/gen_gcmid.sh > \
-src/org/eehouse/android/xw4/GCMConsts.java && cd ../ && sed -i '/R.java/d' \
-scripts/genvers.sh && scripts/genvers.sh XWords4 xw4 > ant_out.txt,buildjni=yes
-Build Version:4.4 beta 62,54,!doesn't seem to be source for this
+Build:4.4 beta 33,26
+    commit=android_beta_33
+    subdir=xwords4/android/XWords4
+    buildjni=yes
+
+Build:4.4 beta 38,30
+    commit=android_beta_38
+    subdir=xwords4/android/XWords4
+    buildjni=yes
+
+Build:4.4 beta 39,31
+    commit=android_beta_39
+    subdir=xwords4/android/XWords4
+    target=android-8
+    prebuild=cd .. && \
+        scripts/genvers.sh >ant_out.txt
+    buildjni=yes
+
+Build:4.4,50
+    commit=android_beta_58
+    subdir=xwords4/android/XWords4
+    update=force
+    forceversion=yes
+    prebuild=../scripts/gen_gcmid.sh > src/org/eehouse/android/xw4/GCMConsts.java && \
+        cd ../ && \
+        sed -i '/R.java/d' scripts/genvers.sh && \
+        scripts/genvers.sh XWords4 xw4 > ant_out.txt
+    buildjni=yes
+
+Build:4.4 beta 60,52
+    commit=android_beta_60
+    subdir=xwords4/android/XWords4
+    update=force
+    prebuild=../scripts/gen_gcmid.sh > src/org/eehouse/android/xw4/GCMConsts.java && \
+        cd ../ && \
+        sed -i '/R.java/d' scripts/genvers.sh && \
+        scripts/genvers.sh XWords4 xw4 > ant_out.txt
+    buildjni=yes
+
+Build:4.4 beta 71,63
+    disable=don't know what to do with genvers.sh, strange compilation issues
+    commit=android_beta_71
+    subdir=xwords4/android/XWords4
+    update=force
+    prebuild=../scripts/gen_gcmid.sh > src/org/eehouse/android/xw4/GCMConsts.java && \
+        cd ../ && \
+        sed -i '/R.java/d' scripts/genvers.sh && \
+        scripts/genvers.sh XWords4 xw4 ??? true > ant_out.txt
+    buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:4.4
-Current Version Code:55
+Current Version:4.4 beta 76
+Current Version Code:68
 
diff --git a/metadata/org.envaya.sms.txt b/metadata/org.envaya.sms.txt
index 410d18d490..8450a00c9b 100644
--- a/metadata/org.envaya.sms.txt
+++ b/metadata/org.envaya.sms.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:MIT
 Web Site:https://envaya.org
 Source Code:https://github.com/youngj/EnvayaSMS
diff --git a/metadata/org.epstudios.epmobile.txt b/metadata/org.epstudios.epmobile.txt
index 5c52ec453d..bda37fed51 100644
--- a/metadata/org.epstudios.epmobile.txt
+++ b/metadata/org.epstudios.epmobile.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://www.epstudiossoftware.com/blog/?page_id=6
 Source Code:https://github.com/mannd/epmobile
@@ -17,17 +17,35 @@ risk scores, diagnostic tools, ECG figures, and more.
 Repo Type:git
 Repo:https://github.com/mannd/epmobile.git
 
-Build Version:1.2,18,74c857
-Build Version:1.3,19,v1.3
-Build Version:1.3.1,20,v1.3.1
-Build Version:1.5.1,24,v1.5.1
-Build Version:2.0,25,v2.0
-Build Version:2.0.1,26,v2.0.1
-Build Version:2.1,27,v2.1
-Build Version:2.2.1,29,v2.2.1
+Build:1.2,18
+    commit=74c857
 
-Auto Update Mode:None
+Build:1.3,19
+    commit=v1.3
+
+Build:1.3.1,20
+    commit=v1.3.1
+
+Build:1.5.1,24
+    commit=v1.5.1
+
+Build:2.0,25
+    commit=v2.0
+
+Build:2.0.1,26
+    commit=v2.0.1
+
+Build:2.1,27
+    commit=v2.1
+
+Build:2.2.1,29
+    commit=v2.2.1
+
+Build:2.2.2,30
+    commit=v2.2.2
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.2.1
-Current Version Code:29
+Current Version:2.2.2
+Current Version Code:30
 
diff --git a/metadata/org.epstudios.morbidmeter.txt b/metadata/org.epstudios.morbidmeter.txt
index f6356c51c5..9b9100dd66 100644
--- a/metadata/org.epstudios.morbidmeter.txt
+++ b/metadata/org.epstudios.morbidmeter.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://github.com/mannd/morbidmeter-android
 Source Code:https://github.com/mannd/morbidmeter-android
diff --git a/metadata/org.evilsoft.pathfinder.reference.txt b/metadata/org.evilsoft.pathfinder.reference.txt
new file mode 100644
index 0000000000..3571aec903
--- /dev/null
+++ b/metadata/org.evilsoft.pathfinder.reference.txt
@@ -0,0 +1,44 @@
+Categories:Games
+License:GPLv3
+Web Site:http://legolas.org
+Source Code:https://github.com/devonjones/PathfinderOpenReference
+Issue Tracker:https://github.com/devonjones/PathfinderOpenReference/issues
+
+Auto Name:Masterwork Tools: Pathfinder Open Reference
+Summary:RPG reference manual
+Description:
+This reference gives you rapid access to every feat, spell, class, skill, 
+monster and rule in the full Pathfinder Roleplaying Game Reference Document. 
+With intuitive indexing and powerful search capability, the reference gets 
+you the information you need quickly so you can get back to the game. 
+Includes rules material from the Pathfinder Roleplaying Game Core Rulebook, 
+Advanced Player’s Guide, Ultimate Magic, Ultimate Combat, Ultimate Equipment, 
+GameMastery Guide, NPC Codex, Bestiary, Bestiary 2 and Bestiary 3.
+
+The application has 31000 rule snippets allowing you to access over 20000 
+discrete rule topics. Including: 725 Feats, 1358 Spells, 1402 Monsters & NPCs, 
+45 Classes and a ton more. 
+The application allows you to hone in the passages that matter for what’s 
+going on in game now. Every title in every article is a link that lets you 
+just see/bookmark that section. It has a powerful and fast search lets you 
+find the rule you need, quickly.
+It also allows you to create bookmark collections. You can bookmark passages 
+that you want quick access to as a GM, while creating other collections for 
+your characters, giving you quick access to the rules that applicable to that 
+character.
+.
+
+Repo Type:git
+Repo:https://github.com/devonjones/PathfinderOpenReference.git
+
+Build:1.0.18,19
+    commit=1.0.19
+    update=force
+    rm=libs/android-ant.jar;libs/libspen23_multiwindow.jar
+    srclibs=1:ActionBarSherlock@4.4.0
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.18
+Current Version Code:19
+
diff --git a/metadata/org.example.pushupbuddy.txt b/metadata/org.example.pushupbuddy.txt
index 6bbd3fe8ad..7575819466 100644
--- a/metadata/org.example.pushupbuddy.txt
+++ b/metadata/org.example.pushupbuddy.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://launchpad.net/pushupbuddy/
 Source Code:https://code.launchpad.net/~rheo/pushupbuddy/trunk
diff --git a/metadata/org.fastergps.txt b/metadata/org.fastergps.txt
index 0443101098..b578184ffc 100644
--- a/metadata/org.fastergps.txt
+++ b/metadata/org.fastergps.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/android-apps/#fastergps
 Source Code:https://github.com/dschuermann/faster-gps
@@ -26,31 +26,59 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/dschuermann/faster-gps.git
 
-Build Version:1.0,1,90430ede39c5ad4fef338744af954f865b246c41,subdir=org_fastergps/
-Build Version:1.2,3,aa1f260,subdir=org_fastergps/
-Build Version:1.3,4,f6d9482,subdir=org_fastergps/,prebuild=\
-$$SDK$$/tools/android update project -p ../org_donations
-Build Version:1.4,5,0bd14a0,subdir=org_fastergps/,prebuild=\
-$$SDK$$/tools/android update project -p ../org_donations
-Build Version:1.6,7,399ec19,subdir=FasterGPS,\
-extlibs=htmlcleaner/htmlcleaner-2.2.jar,init=rm -f android-libs/Donations/custom_rules.xml && \
-git clone https://github.com/dschuermann/HtmlSpanner android-libs/HS && \
-git clone https://github.com/dschuermann/root-commands android-libs/RC && \
-cd android-libs/RC && git checkout a99695d4cd && rm -rf RootCommands-Demo,\
-update=.;android-libs/Donations;android-libs/HS/htmlspanner;\
-android-libs/RC/RootCommands-Library,prebuild=\
-find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \
-rm -f libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && \
-cp -f libs/htmlcleaner-2.2.jar android-libs/HS/htmlspanner/libs/ && \
-echo "android.library.reference.2=android-libs/RC/RootCommands-Library" >> project.properties && \
-echo "android.library.reference.3=android-libs/HS/htmlspanner" >> project.properties && \
-cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
-android-libs/Donations/src/org/donations/
-Build Version:1.9,11,v1.9,subdir=FasterGPS,gradle=fdroid
-Build Version:1.10,12,v1.10,subdir=FasterGPS,gradle=fdroid
+Build:1.0,1
+    commit=90430ede39c5ad4fef338744af954f865b246c41
+    subdir=org_fastergps/
+
+Build:1.2,3
+    commit=aa1f260
+    subdir=org_fastergps/
+
+Build:1.3,4
+    commit=f6d9482
+    subdir=org_fastergps/
+    prebuild=$$SDK$$/tools/android update project -p ../org_donations
+
+Build:1.4,5
+    commit=0bd14a0
+    subdir=org_fastergps/
+    prebuild=$$SDK$$/tools/android update project -p ../org_donations
+
+Build:1.6,7
+    commit=399ec19
+    subdir=FasterGPS
+    init=rm -f android-libs/Donations/custom_rules.xml && \
+        git clone https://github.com/dschuermann/HtmlSpanner android-libs/HS && \
+        git clone https://github.com/dschuermann/root-commands android-libs/RC && \
+        cd android-libs/RC && \
+        git checkout a99695d4cd && \
+        rm -rf RootCommands-Demo
+    update=.;android-libs/Donations;android-libs/HS/htmlspanner;android-libs/RC/RootCommands-Library
+    extlibs=htmlcleaner/htmlcleaner-2.2.jar
+    prebuild=find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && \
+        rm -f libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && \
+        cp -f libs/htmlcleaner-2.2.jar android-libs/HS/htmlspanner/libs/ && \
+        echo "android.library.reference.2=android-libs/RC/RootCommands-Library" >> project.properties && \
+        echo "android.library.reference.3=android-libs/HS/htmlspanner" >> project.properties && \
+        cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
+
+Build:1.9,11
+    commit=v1.9
+    subdir=FasterGPS
+    gradle=fdroid
+
+Build:1.10,12
+    commit=v1.10
+    subdir=FasterGPS
+    gradle=fdroid
+
+Build:1.11,13
+    commit=v1.11
+    subdir=FasterGPS
+    gradle=fdroid
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.10
-Current Version Code:12
+Current Version:1.11
+Current Version Code:13
 
diff --git a/metadata/org.fdroid.chatsafe.txt b/metadata/org.fdroid.chatsafe.txt
index 87c392970f..31850df59a 100644
--- a/metadata/org.fdroid.chatsafe.txt
+++ b/metadata/org.fdroid.chatsafe.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:
 Source Code:https://github.com/WhisperSystems/TextSecure
diff --git a/metadata/org.fdroid.dashclock.k9.txt b/metadata/org.fdroid.dashclock.k9.txt
deleted file mode 100644
index b8fb1a8ce7..0000000000
--- a/metadata/org.fdroid.dashclock.k9.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Disabled:org.fdroid.k9 replaced by source built com.fsck.k9
-Category:Wallpaper
-License:Apache2
-Web Site:
-Source Code:https://github.com/cketti/DashClock_K-9
-Issue Tracker:https://github.com/cketti/DashClock_K-9/issues
-
-Name:DashClock: K-9 Mail~
-Auto Name:K-9 Mail DashClock Extension
-Summary:Email info on the lockscreen
-Description:
-[[net.nurik.roman.dashclock]] extension that displays the number of
-unread emails from [[org.fdroid.k9]], from your choice of accounts.
-
-'''Only works with F-Droid's K-9 package'''
-
-Marking messages as read in K-9 won't reliably update the unread count 
-if you are using v4.201 of K-9 — current versions of K-9 should work fine.
-.
-
-Repo Type:git
-Repo:https://github.com/cketti/DashClock_K-9.git
-
-Build Version:1.1-fdroid,2,release-v1.1,forceversion=yes,patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
-echo "android.jar=$$SDK$$/platforms/android-17/android.jar" > ant.properties
-Build Version:1.2-fdroid,3,release-v1.2,\
-forceversion=yes,\
-patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
-         echo 'android.jar=$$SDK$$/platforms/android-17/android.jar' > ant.properties
-
-Build Version:1.3-fdroid,4,release-v1.3,forceversion=yes,patch=packageid.patch,\
-prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
-         echo 'android.jar=$$SDK$$/platforms/android-17/android.jar' > ant.properties
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.3
-Current Version Code:4
-
diff --git a/metadata/org.fdroid.dashclock.k9/packageid.patch b/metadata/org.fdroid.dashclock.k9/packageid.patch
deleted file mode 100644
index 470f03d56b..0000000000
--- a/metadata/org.fdroid.dashclock.k9/packageid.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 820fcd0..278fd07 100644
---- a/build.xml
-+++ b/build.xml
-@@ -88,5 +88,23 @@
-     -->
-     <!-- version-tag: 1 -->
-     <import file="${sdk.dir}/tools/ant/build.xml" />
--
-+    <target name="-package-resources" depends="-crunch">
-+	  <do-only-if-not-library elseText="Library project: do not package resources..." >
-+               <exec executable="${aapt}" failonerror="true">
-+  			<arg value="package" />
-+  			<arg value="-f" />
-+  			<arg value="-M" />
-+  			<arg path="AndroidManifest.xml" />
-+  			<arg value="-F" />
-+			<arg path="${out.absolute.dir}/${resource.package.file.name}" />
-+  			<arg value="-I" />
-+			<arg path="${android.jar}" />
-+  			<arg value="-S" />
-+			<arg path="${resource.absolute.dir}" />
-+  			<arg value="--auto-add-overlay" />
-+  			<arg value="--rename-manifest-package" />
-+  			<arg value="org.fdroid.dashclock.k9" />
-+		</exec>
-+	  </do-only-if-not-library>
-+   </target>
- </project>
diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index abf16c5c48..dfcb4c643f 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:https://f-droid.org
 Source Code:https://gitorious.org/f-droid/fdroidclient
@@ -10,11 +10,11 @@ Bitcoin:15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 Auto Name:F-Droid
 Summary:Application manager
 Description:
-Connects to F-Droid compatible repositories. The default repo is hosted at f-droid.org,
-which contains only bona fide FOSS.
+Connects to F-Droid compatible repositories. The default repo is hosted at
+f-droid.org, which contains only bona fide FOSS.
 
-Android is open in the sense that you are free to install apks from anywhere you wish,
-but there are many good reasons for using a client/repository setup:
+Android is open in the sense that you are free to install apks from anywhere
+you wish, but there are many good reasons for using a client/repository setup:
 
 * Be notified when updates are available
 * Keep track of older and beta versions
@@ -23,62 +23,177 @@ but there are many good reasons for using a client/repository setup:
 * Access associated urls for donations, source code etc.
 * Stay safe by checking repo index signatures and apk hashes
 
-Please note that while the client itself is FOSS and well inspected by the public, the
-apps themselves may not be. You install them at your own risk. By default, apps which
-may have undesirable behaviour i.e. anti-features, are hidden from view.
-
 [http://f-droid.org/posts/category/changelog Changelog]
 .
 
 Repo Type:git
 Repo:git://gitorious.org/f-droid/fdroidclient.git
 
-#These ones are already in the repo as binaries...
-#Build Version:0.12,3,651696a49be2cd7db5ce6a2fa8185e31f9a20035
-#Build Version:0.13,4,4f677285cc2cf0b7e7feb5c9acf61791bec15fbc
-#Build Version:0.16,7,78325dad91a263437ca4ea1210bd494446c4d003
-Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a,update=force
-Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238,update=force
-Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59,update=force
-Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813,update=force
-Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1,update=force
-Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68,update=force
-Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172,update=force
-Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2,update=force
-Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b,update=force
-Build Version:0.28,19,f881aabe5bd0ac94771b03f1318a6e0972ab4128,target=android-15
-Build Version:0.29,20,87b229b95d0909bfd05c65c5670794e743626f6c,target=android-15
-Build Version:0.30,21,497cb19840f79b31ae9590f5abd9e4df832b34ee,target=android-15
-Build Version:0.31,22,f99f8a544c7cb4d4a48ad09da00ad281af05f2ac,target=android-15
-Build Version:0.32,23,cc3970cc243e345416bfc62781ece6eeefd11495,target=android-15
-Build Version:0.33,24,58eb580159aa4d54767f0af1736cad233fec2475,target=android-15
-Build Version:0.34-test,25,335d27b725b0f92e9e8804ae09518cd47bc7b021,target=android-15
-Build Version:0.35-test,26,a06d18b029392669e98359f86c07e442a04e6a13,target=android-15
-Build Version:0.36-test,27,647e230c9e888c04bb0554078c5aa81da63548a0,target=android-15
-Build Version:0.37-test,28,3c02e3ccc147a34af42cedf7d85f18dc75c8efa8,target=android-15
-Build Version:0.38,38,99b52c988d203811f434d6ac40675a63d5ae41ab,target=android-15
-Build Version:0.39-test,39,9a7d0b9f10710105d51d8206a7faa4408c60c20d,target=android-15
-Build Version:0.40,40,51a67efdf1ee2819bee99d9263b2980dafaf761d,target=android-15
-Build Version:0.42,42,36b815095ef51ca4f21887d973dbc0a50575cd65,target=android-15
-Build Version:0.43,43,!sdk doesn't like tzm (at f2109e4e0bf1597c625221d8d2d10050f146ba5a),target=android-15
-Build Version:0.44,44,!nasty upgrade bug 0.44,target=android-15
-Build Version:0.45,45,0.45,target=android-15
-Build Version:0.46,46,0.46,target=android-15
-Build Version:0.47-test,47,0.47-test,target=android-17
-Build Version:0.48-test,48,0.48-test,target=android-17
-Build Version:0.50,50,0.50
-Build Version:0.51-test,51,0.51-test
-Build Version:0.52-test,52,0.52-test,submodules=yes,\
-update=.;extern/Universal-Image-Loader/library,prebuild=rm -rf extern/Universal-Image-Loader/downloads
-Build Version:0.53-test,53,0.53-test,submodules=yes,\
-update=.;\
-	extern/Universal-Image-Loader/library,\
-prebuild=\
-	rm -rf extern/Universal-Image-Loader/downloads
+Build:0.17,8
+    commit=c626ce5f6d3e10ae15942f01ff028be310cc695a
+    update=force
+
+Build:0.18,9
+    commit=a6c9ed8d06b19315df9ba9041324f78139f7d238
+    update=force
+
+Build:0.19,10
+    commit=540b7d0522f4d67a4896697f7342e4c75b4cbf59
+    update=force
+
+Build:0.20,11
+    commit=ddacfb856ad66c1c367e20c9cbecbfb15fe00813
+    update=force
+
+Build:0.21,12
+    commit=49fa56aa6626a190f2d711120b69e435e9e615b1
+    update=force
+
+Build:0.22,13
+    commit=a6a33c942495cc4c74a7cb6e968efe0e00815e68
+    update=force
+
+Build:0.23,14
+    commit=aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172
+    update=force
+
+Build:0.24,15
+    commit=9b5fe2976443255b95027abd412f1c1e7f3d27b2
+    update=force
+
+Build:0.25,16
+    commit=43977cc493e47a4dc841c4192ae8a40fb14b639b
+    update=force
+
+Build:0.28,19
+    commit=f881aabe5bd0ac94771b03f1318a6e0972ab4128
+    target=android-15
+
+Build:0.29,20
+    commit=87b229b95d0909bfd05c65c5670794e743626f6c
+    target=android-15
+
+Build:0.30,21
+    commit=497cb19840f79b31ae9590f5abd9e4df832b34ee
+    target=android-15
+
+Build:0.31,22
+    commit=f99f8a544c7cb4d4a48ad09da00ad281af05f2ac
+    target=android-15
+
+Build:0.32,23
+    commit=cc3970cc243e345416bfc62781ece6eeefd11495
+    target=android-15
+
+Build:0.33,24
+    commit=58eb580159aa4d54767f0af1736cad233fec2475
+    target=android-15
+
+Build:0.34-test,25
+    commit=335d27b725b0f92e9e8804ae09518cd47bc7b021
+    target=android-15
+
+Build:0.35-test,26
+    commit=a06d18b029392669e98359f86c07e442a04e6a13
+    target=android-15
+
+Build:0.36-test,27
+    commit=647e230c9e888c04bb0554078c5aa81da63548a0
+    target=android-15
+
+Build:0.37-test,28
+    commit=3c02e3ccc147a34af42cedf7d85f18dc75c8efa8
+    target=android-15
+
+Build:0.38,38
+    commit=99b52c988d203811f434d6ac40675a63d5ae41ab
+    target=android-15
+
+Build:0.39-test,39
+    commit=9a7d0b9f10710105d51d8206a7faa4408c60c20d
+    target=android-15
+
+Build:0.40,40
+    commit=51a67efdf1ee2819bee99d9263b2980dafaf761d
+    target=android-15
+
+Build:0.42,42
+    commit=36b815095ef51ca4f21887d973dbc0a50575cd65
+    target=android-15
+
+Build:0.43,43
+    disable=sdk doesn't like tzm (at f2109e4e0bf1597c625221d8d2d10050f146ba5a)
+    commit=f2109e4e0bf1597c625221d8d2d10050f146ba5a
+    target=android-15
+
+Build:0.44,44
+    disable=nasty upgrade bug
+    commit=0.44
+    target=android-15
+
+Build:0.45,45
+    commit=0.45
+    target=android-15
+
+Build:0.46,46
+    commit=0.46
+    target=android-15
+
+Build:0.47-test,47
+    commit=0.47-test
+    target=android-17
+
+Build:0.48-test,48
+    commit=0.48-test
+    target=android-17
+
+Build:0.50,50
+    commit=0.50
+
+Build:0.51-test,51
+    commit=0.51-test
+
+Build:0.52-test,52
+    commit=0.52-test
+    submodules=yes
+    update=.;extern/Universal-Image-Loader/library
+    prebuild=rm -rf extern/Universal-Image-Loader/downloads
+
+Build:0.53-test,53
+    commit=0.53-test
+    submodules=yes
+    scandelete=yes
+
+Build:0.54,540
+    commit=0.54
+    submodules=yes
+    scandelete=yes
+
+Build:0.55,550
+    commit=0.55
+    submodules=yes
+
+Build:0.56-test,560
+    commit=0.56-test
+    submodules=yes
+
+Build:0.57-test,570
+    commit=0.57-test
+    submodules=yes
+
+Build:0.58,580
+    commit=0.58
+    submodules=yes
+
+Maintainer Notes:
+Could switch this to use Tags update check mode, but it would be good to filter
+tags ending in '-test' - specifically, build them, but do not set them as the
+current version. Various other apps would benefit from that too.
+.
 
 Archive Policy:6 versions
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:0.50
-Current Version Code:50
+Current Version:0.58
+Current Version Code:580
 
diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index 0c99e7dd08..0b4580a7be 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -1,10 +1,9 @@
-# Keep it for ~1week to alert users who switched
-#Disabled:Replaced by original com.fsck.k9
-Category:Office
+Disabled:Replaced by original com.fsck.k9
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/k9mail
 Source Code:https://github.com/k9mail/k-9
-Issue Tracker:http://code.google.com/p/k9mail/issues/list
+Issue Tracker:http://code.google.com/p/k9mail/issues
 
 Auto Name:K-9 Mail
 Name:K-9 Mail (old)
@@ -24,7 +23,7 @@ there, you should find the options in the menu.
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-Build Version:4.409,17046,4.409,\
+Build Version:4.409,17046,!remove apk at 4.409,\
 init=sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
 library/project.properties,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
@@ -43,5 +42,7 @@ build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
       mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:Static
+Current Version:4.409
+Current Version Code:17046
 
diff --git a/metadata/org.fdroid.superuser.txt b/metadata/org.fdroid.superuser.txt
index 6fa61577be..115415e1ba 100644
--- a/metadata/org.fdroid.superuser.txt
+++ b/metadata/org.fdroid.superuser.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/koush/Superuser
 Source Code:https://github.com/koush/Superuser
diff --git a/metadata/org.fdroid.taskstrid.txt b/metadata/org.fdroid.taskstrid.txt
index e55369cb89..90ae036854 100644
--- a/metadata/org.fdroid.taskstrid.txt
+++ b/metadata/org.fdroid.taskstrid.txt
@@ -1,5 +1,5 @@
 Disabled:Still various non-free issues to be resolved
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://gitorious.org/astrid-foss
 Source Code:http://gitorious.org/astrid-foss
diff --git a/metadata/org.fedorahosted.freeotp.txt b/metadata/org.fedorahosted.freeotp.txt
new file mode 100644
index 0000000000..5c2ec964ab
--- /dev/null
+++ b/metadata/org.fedorahosted.freeotp.txt
@@ -0,0 +1,36 @@
+Categories:System
+License:Apache2
+Web Site:https://fedorahosted.org/freeotp/
+Source Code:https://fedorahosted.org/freeotp/browser/android
+Issue Tracker:https://fedorahosted.org/freeotp/report
+
+Auto Name:FreeOTP
+Summary:Two-factor authentication
+Description:
+FreeOTP is a two-factor authentication (2FA) application for systems utilizing
+one-time password protocols (OTP). 
+Tokens can be added easily by scanning a QR-code or by manually entering in the
+token configuration.
+
+FreeOTP implements open standards. This means that no proprietary server-side
+component is necessary: use any server-side component that implements
+these standards - for example [http://www.freeipa.org FreeIPA], which uses TOTP. 
+Any standards-compliant implementation will work. Currently, FreeOTP provides
+implementations of HOTP (RFC 4226) and TOTP (RFC 6238).
+.
+
+Repo Type:git
+Repo:git://git.fedorahosted.org/freeotp/android.git
+
+Build:1.3,11
+    commit=a80af12
+
+Maintainer Notes:
+No tags, or even any indication of versions in commit log.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.3
+Current Version Code:12
+
diff --git a/metadata/org.fosdem.txt b/metadata/org.fosdem.txt
index eb6a35ac7c..c7292d2196 100644
--- a/metadata/org.fosdem.txt
+++ b/metadata/org.fosdem.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://fosdem.org
 Source Code:https://github.com/orrc/fosdem-android
diff --git a/metadata/org.fox.ttrss.txt b/metadata/org.fox.ttrss.txt
index 62c535d75b..b6a2bfadec 100644
--- a/metadata/org.fox.ttrss.txt
+++ b/metadata/org.fox.ttrss.txt
@@ -1,5 +1,5 @@
 Disabled:Unable to reliably maintain - recommend using org.ttrssreader instead
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://tt-rss.org/redmine/projects/tt-rss-android/wiki
 Source Code:https://github.com/gothfox/Tiny-Tiny-RSS-for-Honeycomb
@@ -22,87 +22,161 @@ This dependence on nonfree software has been patched out in f-droid.org builds.
 Repo Type:git
 Repo:https://github.com/gothfox/Tiny-Tiny-RSS-for-Honeycomb.git
 
-Build Version:0.5.3,67,989feec2ce7dc5b8c72d12ce20b18d570ca831ad
-Build Version:0.5.6,71,267ce734c1374088645aa101a02b5db77a9dde4b
-Build Version:0.5.7,72,cf3357d49b3b
-Build Version:0.6.1,74,277c2e0e473
-Build Version:0.6.7,83,969d3bb
-Build Version:0.6.9,85,9341df4c2191e83cb60beed38935d881b9ff4b04
-Build Version:0.6.10,86,e68c90cbceab1319
-Build Version:0.6.11,87,77352728e7085bf9
-Build Version:0.7.1,93,89e125d3ca2
-Build Version:0.7.2,94,48dc7fd846d4178b
-Build Version:0.7.3,95,623aac676ee3b
-Build Version:0.7.5,97,86a4f6c2dea5
-Build Version:0.7.6,98,a7dd01131d8f181
-Build Version:0.8.4,105,0570783c7631737f
-Build Version:0.8.5,106,297259762228a2e7d7
-Build Version:0.8.6,107,c6225cd16e73fd6
-Build Version:0.8.7,108,f460c59b46c61a
-Build Version:0.8.10,111,f27bbf9e8c
-Build Version:0.8.11,112,7e0c906e2f
-Build Version:0.8.14,115,89ee4a84be
-Build Version:1.10,132,!Proprietary advert (at f0bc21b1a84e8ad3aafdf6768baa6a56ee871b46)
-Build Version:1.12,134,0d4bd2f4465aa499de1db3d5ee9beb859fff004e,patch=notrial.patch
-Build Version:1.15,137,06b61761242f2fe762eb0fdfb6e1306a403ed99b,patch=notrial.patch
-Build Version:1.18,141,f64948d93c4c63c1ff0a500ef924cdeea10d76b4,patch=notrial.patch
-Build Version:1.4,148,48e5015353c,patch=notrial.patch
-Build Version:1.4.6,156,22302be4f9e5,patch=notrial.patch
-Build Version:1.5,158,12f99f09eef4a32de6,patch=notrial.patch
-Build Version:1.7,163,f49fccf5247a7b96791e43c8,patch=notrial_2.patch,srclibs=\
-ActionBarSherlock@4.3.0;ViewPagerIndicator@2.4.1,prebuild=sed -i -e \
-'s@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
-Build Version:1.7.2,165,390c52972824af084c289ab630,patch=notrial_2.patch,srclibs=\
-ActionBarSherlock@4.3.0;ViewPagerIndicator@2.4.1,prebuild=sed -i -e \
-'s@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
-Build Version:1.8.1,181,068bc6bb81011364fc605d,patch=notrial_new.patch,srclibs=\
-ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\
-sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \
--e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-cp libs/android-support-v4.jar $$SlidingMenu$$/libs
-Build Version:1.8.5,185,1f91618d33f68bbb92d9a,patch=notrial_new.patch,srclibs=\
-ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\
-sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \
--e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-cp libs/android-support-v4.jar $$SlidingMenu$$/libs
-Build Version:1.8.7,187,2ad9f766e7,patch=notrial_new.patch,srclibs=\
-ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\
-sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \
--e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-cp libs/android-support-v4.jar $$SlidingMenu$$/libs
-Build Version:1.8.9,189,9af5dd1fb592ace71,patch=notrial_new.patch,srclibs=\
-ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\
-sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \
--e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-cp libs/android-support-v4.jar $$SlidingMenu$$/libs
-Build Version:1.8.13,194,84cfc9a9fe71,\
-rm=libs/dashclock-api-r1.1.jar,\
-srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;\
-SlidingMenu@8fcae2cce29e;DashClock@v1.2,\
-patch=notrial_new.patch,\
-prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \
-           -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
-         echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties && \
-         cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
-         cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
-         cp libs/android-support-v4.jar $$SlidingMenu$$/libs
+Build:0.5.3,67
+    commit=989feec2ce7dc5b8c72d12ce20b18d570ca831ad
+
+Build:0.5.6,71
+    commit=267ce734c1374088645aa101a02b5db77a9dde4b
+
+Build:0.5.7,72
+    commit=cf3357d49b3b
+
+Build:0.6.1,74
+    commit=277c2e0e473
+
+Build:0.6.7,83
+    commit=969d3bb
+
+Build:0.6.9,85
+    commit=9341df4c2191e83cb60beed38935d881b9ff4b04
+
+Build:0.6.10,86
+    commit=e68c90cbceab1319
+
+Build:0.6.11,87
+    commit=77352728e7085bf9
+
+Build:0.7.1,93
+    commit=89e125d3ca2
+
+Build:0.7.2,94
+    commit=48dc7fd846d4178b
+
+Build:0.7.3,95
+    commit=623aac676ee3b
+
+Build:0.7.5,97
+    commit=86a4f6c2dea5
+
+Build:0.7.6,98
+    commit=a7dd01131d8f181
+
+Build:0.8.4,105
+    commit=0570783c7631737f
+
+Build:0.8.5,106
+    commit=297259762228a2e7d7
+
+Build:0.8.6,107
+    commit=c6225cd16e73fd6
+
+Build:0.8.7,108
+    commit=f460c59b46c61a
+
+Build:0.8.10,111
+    commit=f27bbf9e8c
+
+Build:0.8.11,112
+    commit=7e0c906e2f
+
+Build:0.8.14,115
+    commit=89ee4a84be
+
+Build:1.10,132
+    disable=Proprietary advert (at f0bc21b1a84e8ad3aafdf6768baa6a56ee871b46)
+    commit=f0bc21b1a84e8ad3aafdf6768baa6a56ee871b46
+
+Build:1.12,134
+    commit=0d4bd2f4465aa499de1db3d5ee9beb859fff004e
+    patch=notrial.patch
+
+Build:1.15,137
+    commit=06b61761242f2fe762eb0fdfb6e1306a403ed99b
+    patch=notrial.patch
+
+Build:1.18,141
+    commit=f64948d93c4c63c1ff0a500ef924cdeea10d76b4
+    patch=notrial.patch
+
+Build:1.4,148
+    commit=48e5015353c
+    patch=notrial.patch
+
+Build:1.4.6,156
+    commit=22302be4f9e5
+    patch=notrial.patch
+
+Build:1.5,158
+    commit=12f99f09eef4a32de6
+    patch=notrial.patch
+
+Build:1.7,163
+    commit=f49fccf5247a7b96791e43c8
+    srclibs=ActionBarSherlock@4.3.0;ViewPagerIndicator@2.4.1
+    patch=notrial_2.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
+
+Build:1.7.2,165
+    commit=390c52972824af084c289ab630
+    srclibs=ActionBarSherlock@4.3.0;ViewPagerIndicator@2.4.1
+    patch=notrial_2.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs
+
+Build:1.8.1,181
+    commit=068bc6bb81011364fc605d
+    srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e
+    patch=notrial_new.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs
+
+Build:1.8.5,185
+    commit=1f91618d33f68bbb92d9a
+    srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e
+    patch=notrial_new.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs
+
+Build:1.8.7,187
+    commit=2ad9f766e7
+    srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e
+    patch=notrial_new.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs
+
+Build:1.8.9,189
+    commit=9af5dd1fb592ace71
+    srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e
+    patch=notrial_new.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs
+
+Build:1.8.13,194
+    commit=84cfc9a9fe71
+    rm=libs/dashclock-api-r1.1.jar
+    srclibs=ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e;DashClock@v1.2
+    patch=notrial_new.patch
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@'            -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+        echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+        cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs
 
 # src/org/fox/ttrss/FeedsActivity.java; OnlineActivity.java;res/menu/main_menu.xml
 Auto Update Mode:None
 # also on gplay
 Update Check Mode:RepoManifest
-Current Version:1.20
-Current Version Code:216
+Current Version:1.33
+Current Version Code:229
 
diff --git a/metadata/org.gc.networktester.txt b/metadata/org.gc.networktester.txt
index ee0d7e86d2..fcaf555d97 100644
--- a/metadata/org.gc.networktester.txt
+++ b/metadata/org.gc.networktester.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://code.google.com/p/androidnetworktester/
-Source Code:http://code.google.com/p/androidnetworktester/source/checkout
-Issue Tracker:http://code.google.com/p/androidnetworktester/issues/list
+Source Code:http://code.google.com/p/androidnetworktester/source
+Issue Tracker:http://code.google.com/p/androidnetworktester/issues
 
 Auto Name:Network Tester
 Summary:Wifi access point tester
@@ -18,8 +18,7 @@ Repo:http://androidnetworktester.googlecode.com/svn/trunk/
 Build Version:1.1,2,34,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/org.gege.caldavsyncadapter.txt b/metadata/org.gege.caldavsyncadapter.txt
index 4f2402790a..ee507f5ee6 100644
--- a/metadata/org.gege.caldavsyncadapter.txt
+++ b/metadata/org.gege.caldavsyncadapter.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/gggard/AndroidCaldavSyncAdapater
 Source Code:https://github.com/gggard/AndroidCaldavSyncAdapater
@@ -21,15 +21,27 @@ Status: BETA
 Repo Type:git
 Repo:https://github.com/gggard/AndroidCaldavSyncAdapater.git
 
-Build Version:1.6,7,v1.6,subdir=CalDAVSyncAdapter,prebuild=\
-sed -i '/proguard/d' project.properties
-Build Version:1.7,8,v1.7,subdir=CalDAVSyncAdapter,prebuild=\
-sed -i '/proguard/d' project.properties
-Build Version:1.8,15,v1.8,subdir=CalDAVSyncAdapter,prebuild=\
-	sed -i 's@/libs/@libs/@g' proguard-project.txt
+Build:1.6,7
+    commit=v1.6
+    subdir=CalDAVSyncAdapter
+    prebuild=sed -i '/proguard/d' project.properties
+
+Build:1.7,8
+    commit=v1.7
+    subdir=CalDAVSyncAdapter
+    prebuild=sed -i '/proguard/d' project.properties
+
+Build:1.8,15
+    commit=v1.8
+    subdir=CalDAVSyncAdapter
+    prebuild=sed -i 's@/libs/@libs/@g' proguard-project.txt
+
+Build:1.8.1,18
+    commit=v1.8.1
+    subdir=CalDAVSyncAdapter
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.8
-Current Version Code:15
+Current Version:1.8.1
+Current Version Code:18
 
diff --git a/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt b/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
index 04018f1c64..ab9f594cd2 100644
--- a/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
+++ b/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv2+
 Web Site:http://www.fbreader.org/FBReaderJ/
 Source Code:https://github.com/geometer/FBReaderJ-plugin-local-opds-scanner
diff --git a/metadata/org.geometerplus.fbreader.plugin.tts.txt b/metadata/org.geometerplus.fbreader.plugin.tts.txt
index 197399a340..03014412b7 100644
--- a/metadata/org.geometerplus.fbreader.plugin.tts.txt
+++ b/metadata/org.geometerplus.fbreader.plugin.tts.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:Public Domain
 Web Site:http://www.fbreader.org/FBReaderJ/
 Source Code:https://github.com/geometer/FBReaderJ-plugin-tts
diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt
index adc5e167f9..6b6c6041d8 100644
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeAdd
-Category:Reading
+Categories:Reading
 License:GPLv2+
 Web Site:http://www.fbreader.org/FBReaderJ/
 Source Code:https://github.com/geometer/FBReaderJ
diff --git a/metadata/org.github.OxygenGuide.txt b/metadata/org.github.OxygenGuide.txt
index c9fa403278..dc83e01a01 100644
--- a/metadata/org.github.OxygenGuide.txt
+++ b/metadata/org.github.OxygenGuide.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://github.com/nicolas-raoul/OxygenGuide-Android
 Source Code:https://github.com/nicolas-raoul/OxygenGuide-Android
diff --git a/metadata/org.gitorious.jamesjrh.isokeys.txt b/metadata/org.gitorious.jamesjrh.isokeys.txt
index 3893c5c718..8366a2e972 100644
--- a/metadata/org.gitorious.jamesjrh.isokeys.txt
+++ b/metadata/org.gitorious.jamesjrh.isokeys.txt
@@ -1,7 +1,7 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://gitorious.org/hexiano
-Source Code:https://gitorious.org/hexiano
+Source Code:https://gitorious.org/hexiano/hexiano
 Issue Tracker:https://sourceforge.net/p/isokeys/tickets
 
 Auto Name:Hexiano
@@ -40,8 +40,7 @@ local.properties && ant filter-package
 
 Auto Update Mode:None
 #Generic package id in manifest
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Static
 Current Version:0.82.1
 Current Version Code:14
 
diff --git a/metadata/org.gmote.client.android.txt b/metadata/org.gmote.client.android.txt
index d68fcccb50..ec55a257fb 100644
--- a/metadata/org.gmote.client.android.txt
+++ b/metadata/org.gmote.client.android.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://gmote.org
-Source Code:http://code.google.com/p/gmote/source/list
-Issue Tracker:http://code.google.com/p/gmote/issues/list
+Source Code:http://code.google.com/p/gmote/source
+Issue Tracker:http://code.google.com/p/gmote/issues
 Donate:http://gmote.org/index#donate
 
 Auto Name:Gmote
diff --git a/metadata/org.gnucash.android.txt b/metadata/org.gnucash.android.txt
index 12889455c6..d716bac6d6 100644
--- a/metadata/org.gnucash.android.txt
+++ b/metadata/org.gnucash.android.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/codinguser/gnucash-android
 Source Code:https://github.com/codinguser/gnucash-android
@@ -17,24 +17,64 @@ however.
 Repo Type:git
 Repo:https://github.com/codinguser/gnucash-android.git
 
-Build Version:1.0,1,v1.0.beta1,subdir=GnucashMobile,update=.;../com_actionbarsherlock
+Build:1.0,1
+    commit=v1.0.beta1
+    subdir=GnucashMobile
+    update=.;../com_actionbarsherlock
+
 #Can also use maven
-Build Version:1.0.1,2,v1.0.1,subdir=GnucashMobile,update=.;../com_actionbarsherlock
-Build Version:1.0.2,3,v1.0.2,subdir=GnucashMobile,update=.;../com_actionbarsherlock
-Build Version:1.1.1,6,v1.1.1,subdir=GnucashMobile,update=.;../com_actionbarsherlock
-Build Version:1.1.2,7,v1.1.2,subdir=app,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.0,8,v1.2.0,subdir=app,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.2,10,v1.2.2,subdir=app,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.3,13,v1.2.3,subdir=app,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.2.4,14,v1.2.4,subdir=app,srclibs=ActionBarSherlock@4.2.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build:1.0.1,2
+    commit=v1.0.1
+    subdir=GnucashMobile
+    update=.;../com_actionbarsherlock
+
+Build:1.0.2,3
+    commit=v1.0.2
+    subdir=GnucashMobile
+    update=.;../com_actionbarsherlock
+
+Build:1.1.1,6
+    commit=v1.1.1
+    subdir=GnucashMobile
+    update=.;../com_actionbarsherlock
+
+Build:1.1.2,7
+    commit=v1.1.2
+    subdir=app
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.0,8
+    commit=v1.2.0
+    subdir=app
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.2,10
+    commit=v1.2.2
+    subdir=app
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.3,13
+    commit=v1.2.3
+    subdir=app
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.4,14
+    commit=v1.2.4
+    subdir=app
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.2.7,22
+    commit=v1.2.7
+    subdir=app
+    srclibs=1:ActionBarSherlock@4.4.0
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.2.4
-Current Version Code:14
+Current Version:1.2.7
+Current Version Code:22
 
diff --git a/metadata/org.hanenoshino.onscripter.txt b/metadata/org.hanenoshino.onscripter.txt
new file mode 100644
index 0000000000..c76750a0a7
--- /dev/null
+++ b/metadata/org.hanenoshino.onscripter.txt
@@ -0,0 +1,67 @@
+Categories:Games
+License:GPLv2+
+#
+# Following Android ports can be found on Internet:
+# 1 Older version of Natdon's, already unbuildable; original focus of most non-JP efforts.
+#
+#   Hosted on:
+#   http://sourceforge.net/p/onscripter/code-0/ (earliest upload?)
+#   http://code.google.com/p/onscripter/
+#
+#   Package: cn.natdon.onscripter
+#
+# 2 Newer maintained version of CN fork, recently merged with MiNE3. Relies on closed-source vitamio.jar 
+#   for video playback (see also https://bbs.vitamio.org/topics/83?locale=en).
+#
+#   Hosted on:
+#   https://github.com/natdon/ONScripter-CN/
+#
+#   Package: cn.natdon.onscripterv2
+#
+# 3 Our package; was based on #1, but later backported stuff from various sources
+#
+# 4 http://onscripter.sourceforge.jp/android/android.html - upstream Japanese attempt. Also happens to 
+#   be upstream for engine core. Use tarballs for publishing, but developer of #3 tracks them on Github.
+#
+#   Hosted on:
+#   http://onscripter.sourceforge.jp/onscripter.html#package-source (core tarballs)
+#   https://github.com/shinohane/onscripter-versiontrack
+#   http://onscripter.sourceforge.jp/android/android.html#sdk (android tarballs)
+#   https://github.com/shinohane/onscripter_android-versiontrack
+#
+#   package: jp.ogapee.onscripter
+#
+Web Site:http://onscripter.sourceforge.jp/android/android.html
+# See also http://onscripter.sourceforge.jp/android/android.html#sdk
+# (hardcore Japanese developers don't use VCS!)
+Source Code:http://code.google.com/p/onscripter/source
+# All other trackers are empty..
+Issue Tracker:http://onscripter.sourceforge.jp/cgi-bin/kagemai/guest.cgi?project=onscripter&action=top
+
+Name:ONScripter
+Summary:Visual Novel player
+Description:
+Only English ONScripter games are known to be supported. This port uses upstream ONScripter engine, but 
+any Android-specific issues should be reported to port developer (see source code link).
+.
+
+Repo Type:git
+Repo:https://github.com/shinohane/onscripter
+
+Build:20120310,20120310
+    commit=eaf9848c79
+    init=echo "APP_CFLAGS += -DENABLE_1BYTE_CHAR -DFORCE_1BYTE_CHAR" > jni/Application.mk && \
+        rm -r jni/sdl_ttf/VisualC*
+    target=android-17
+    srclibs=ONScripter@28b4b185ba
+    patch=jpeg.patch
+    prebuild=cp -r $$ONScripter$$ jni/application/onscripter-20120310
+    buildjni=yes
+
+Auto Update Mode:None
+# Not that it has good chances to be updated anyway..
+# (see https://github.com/shinohane/ONScripter-SAO for blob-filled replacement..)
+Update Check Mode:Static
+Current Version:20120310
+Current Version Code:20120310
+
diff --git a/metadata/org.hanenoshino.onscripter/jpeg.patch b/metadata/org.hanenoshino.onscripter/jpeg.patch
new file mode 100644
index 0000000000..1b1907b6c8
--- /dev/null
+++ b/metadata/org.hanenoshino.onscripter/jpeg.patch
@@ -0,0 +1,31 @@
+diff --git a/p/jni/jpeg/jidctfst.S b/p/jni/jpeg/jidctfst.S
+index 34e1c24..b35f938 100644
+--- a/jni/jpeg/jidctfst.S
++++ b/jni/jpeg/jidctfst.S
+@@ -63,7 +63,7 @@
+ 
+ 
+ jpeg_idct_ifast:
+-    PLD     (r2, #0)
++    PLD     [r2, #0]
+     stmdb   sp!, {r4,r5, r6,r7, r8,r9, r10,r11, r12,lr}
+     ldr     r4, [sp, #4*10]
+     sub     sp, #local_SIZE
+@@ -256,7 +256,7 @@ VLoopHead:
+ 
+ HLoopStart:
+     // reset pointers
+-    PLD     (sp, #off_WORKSPACE)
++    PLD     [sp, #off_WORKSPACE]
+     add     ip, sp, #off_WORKSPACE
+     ldr     r10, local_RANGE_TABLE
+ 
+@@ -268,7 +268,7 @@ HLoopTail:
+     str      r0, local_OUTPUT_BUF
+     add      fp, r2, r1
+ 
+-    PLD      (ip, #32)
++    PLD      [ip, #32]
+     ldmia    ip!, {r0-r7}
+ 
+     cmp      r1, #0
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index 80987d2722..657f5b554f 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2+
 Web Site:http://xmp.sourceforge.net/
 Source Code:http://sourceforge.net/projects/xmp/develop
@@ -19,35 +19,96 @@ Repo:git://git.code.sf.net/p/xmp/xmp-android
 
 # This is one of those projects that put the changelog in the version
 # number, so fix that with forceversion.
-Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\
-buildjni=yes,subdir=src/android/project,target=android-8,\
-forceversion=yes
-Build Version:2.9.0,21,03a9c9c9d5acf3b1b659e407c18d072309d50e3a,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14,\
-forceversion=yes
-Build Version:3.2.0,30,2c7b8dd28dff53b876ad19498d0f634805fd0a2,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14
-Build Version:3.2.1,31,android-3.2.1,\
-init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14
-Build Version:3.4.2,35,android-3.4.2,buildjni=yes,target=android-14,init=cd ../../ && autoconf && ./configure,subdir=players/android
-Build Version:3.4.3,36,android-3.4.3,subdir=players/android,buildjni=yes,target=android-14,init=\
-cd ../../ && autoconf && ./configure
-Build Version:3.5.0,38,android-3.5.0,target=android-17,init=\
-cd jni && git clone git://git.code.sf.net/p/xmp/libxmp xmp-libxmp && \
-ln -fs xmp-libxmp/include include && ln -fs xmp-libxmp/src src && \
-sed -i 's/..\/..\/libxmp/xmp-libxmp/g' Android.mk && cd xmp-libxmp && \
-autoconf && ./configure,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g;10d' AndroidManifest.xml,buildjni=yes
-Build Version:3.6.0,39,android-3.6.0,\
-target=android-17,srclibs=Libxmp@libxmp-4.1.0,prebuild=\
-sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g;/supports-screens/d' AndroidManifest.xml && \
-cd jni && cp -r ../../extlib/Libxmp . && \
-ln -fs Libxmp/include include && ln -fs Libxmp/src src && \
-sed -i 's/..\/..\/libxmp/Libxmp/g' Android.mk && cd Libxmp && \
-autoconf && ./configure,buildjni=yes
+Build:2.1.0,15
+    commit=639549fda2111cb800fabe468b4a64bf4ae27003
+    subdir=src/android/project
+    target=android-8
+    forceversion=yes
+    buildjni=yes
+
+Build:2.9.0,21
+    commit=03a9c9c9d5acf3b1b659e407c18d072309d50e3a
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    forceversion=yes
+    buildjni=yes
+
+Build:3.2.0,30
+    commit=2c7b8dd28dff53b876ad19498d0f634805fd0a2
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.2.1,31
+    commit=android-3.2.1
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.4.2,35
+    commit=android-3.4.2
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.4.3,36
+    commit=android-3.4.3
+    subdir=players/android
+    init=cd ../../ && \
+        autoconf && \
+        ./configure
+    target=android-14
+    buildjni=yes
+
+Build:3.5.0,38
+    commit=android-3.5.0
+    init=cd jni && \
+        git clone git://git.code.sf.net/p/xmp/libxmp xmp-libxmp && \
+        ln -fs xmp-libxmp/include include && \
+        ln -fs xmp-libxmp/src src && \
+        sed -i 's/..\/..\/libxmp/xmp-libxmp/g' Android.mk && \
+        cd xmp-libxmp && \
+        autoconf && \
+        ./configure
+    target=android-17
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g;10d' AndroidManifest.xml
+    buildjni=yes
+
+Build:3.6.0,39
+    commit=android-3.6.0
+    target=android-17
+    srclibs=Libxmp@libxmp-4.1.0
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g;/supports-screens/d' AndroidManifest.xml && \
+        cd jni && \
+        cp -r ../../extlib/Libxmp . && \
+        ln -fs Libxmp/include include && \
+        ln -fs Libxmp/src src && \
+        sed -i 's/..\/..\/libxmp/Libxmp/g' Android.mk && \
+        cd Libxmp && \
+        autoconf && \
+        ./configure
+    buildjni=yes
+
+Build:3.6.2,41
+    commit=android-3.6.2
+    disable=requires libxmp 4.1.6-pre but no such version is tagged
+
+Maintainer Notes:
+See changelog (in res/values/strings.xml) to determine libxmp version.
+.
 
-# See res/values/strings.xml to determine Libxmp version
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:3.6.2
diff --git a/metadata/org.hermit.audalyzer.txt b/metadata/org.hermit.audalyzer.txt
index 12d6bd1e90..b8f0d2df4d 100644
--- a/metadata/org.hermit.audalyzer.txt
+++ b/metadata/org.hermit.audalyzer.txt
@@ -1,9 +1,9 @@
 Disabled:Because nobody wanted to build when it was still in a repo
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Audalyzer
 Source Code:http://code.google.com/p/moonblink/downloads
-Issue Tracker:http://code.google.com/p/moonblink/issues/list
+Issue Tracker:http://code.google.com/p/moonblink/issues
 
 Summary:Realtime audio analyzer
 Description:
diff --git a/metadata/org.hermit.dazzle.txt b/metadata/org.hermit.dazzle.txt
index c8da563956..9852f418d1 100644
--- a/metadata/org.hermit.dazzle.txt
+++ b/metadata/org.hermit.dazzle.txt
@@ -1,9 +1,9 @@
 Disabled:Source repo is gone
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://code.google.com/p/moonblink/wiki/Dazzle
 Source Code:https://code.google.com/moonblink/downloads
-Issue Tracker:https://code.google.com/p/moonblink/issues/list
+Issue Tracker:https://code.google.com/p/moonblink/issues
 
 Summary:Configurable switcher widget
 Description:
diff --git a/metadata/org.hermit.netscramble.txt b/metadata/org.hermit.netscramble.txt
index 823190c883..9979d6e966 100644
--- a/metadata/org.hermit.netscramble.txt
+++ b/metadata/org.hermit.netscramble.txt
@@ -1,9 +1,9 @@
 Disabled:Need to host the source code in a repo
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/ScrambledNet
 Source Code:http://code.google.com/p/moonblink/downloads
-Issue Tracker:http://code.google.com/p/moonblink/issues/list
+Issue Tracker:http://code.google.com/p/moonblink/issues
 
 Auto Name:Scrambled Net
 Summary:Puzzle game
diff --git a/metadata/org.hermit.tricorder.txt b/metadata/org.hermit.tricorder.txt
index 3900a9bc5b..1ec51df56d 100644
--- a/metadata/org.hermit.tricorder.txt
+++ b/metadata/org.hermit.tricorder.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://code.google.com/p/moonblink/wiki/Tricorder
 Source Code:https://bitbucket.org/dalb8/tricorder
-Issue Tracker:http://code.google.com/p/moonblink/issues/list
+Issue Tracker:http://code.google.com/p/moonblink/issues
 
 Auto Name:Tricorder
 Summary:Star Trek-style gadget
diff --git a/metadata/org.herrlado.ask.languagepack.lithuanian.txt b/metadata/org.herrlado.ask.languagepack.lithuanian.txt
index 0d82eae639..aebbbf8141 100644
--- a/metadata/org.herrlado.ask.languagepack.lithuanian.txt
+++ b/metadata/org.herrlado.ask.languagepack.lithuanian.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/anysoftkeyboard
 Source Code:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Lithuanian
@@ -17,7 +17,7 @@ Elektroninis leidinys. Kaunas: VDU leidykla. Elektroninė prieiga:
 http://donelaitis.vdu.lt/publikacijos/Dazninis_zodynas.pdf
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://softkeyboard.googlecode.com/svn/trunk/LanguagePacks/Lithuanian
 
 Build Version:20101104-shift,8,1431,patch=xml.patch,update=force,init=rm -rf bin/ gen/,\
@@ -40,7 +40,7 @@ wget http://softkeyboard.googlecode.com/svn/trunk/DictionaryTools/xml/lt.xml \
 java -jar $$AnySoftKeyboardTools$$/makedict/makedict.jar
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:20111024
 Current Version Code:9
 
diff --git a/metadata/org.herrlado.geofonts.txt b/metadata/org.herrlado.geofonts.txt
index 765701712e..e07838d8bb 100644
--- a/metadata/org.herrlado.geofonts.txt
+++ b/metadata/org.herrlado.geofonts.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://github.com/herrlado
 Source Code:https://github.com/herrlado/GeorgianFonts
diff --git a/metadata/org.hystudio.android.dosbox.txt b/metadata/org.hystudio.android.dosbox.txt
new file mode 100644
index 0000000000..a0f8057bd1
--- /dev/null
+++ b/metadata/org.hystudio.android.dosbox.txt
@@ -0,0 +1,27 @@
+Categories:System
+License:LGPLv2.1
+Web Site:http://androiddosbox.appspot.com/
+Source Code:http://code.google.com/p/adosbox/source
+Issue Tracker:http://code.google.com/p/adosbox/issues
+
+Summary:DOSBox port for Android
+Description:
+DOSBox is a x86 emulator with Tandy/Hercules/CGA/EGA/VGA/SVGA graphics,
+sound and DOS. It’s been designed to run old DOS games under platforms that
+don’t support it.
+.
+
+Repo Type:git-svn
+Repo:http://adosbox.googlecode.com/svn/trunk
+
+Build:0.2.5,20500
+    commit=115
+    target=android-8
+    patch=format-security.patch;assembly.patch
+    buildjni=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.2.5
+Current Version Code:20500
+
diff --git a/metadata/org.hystudio.android.dosbox/assembly.patch b/metadata/org.hystudio.android.dosbox/assembly.patch
new file mode 100644
index 0000000000..0798a8698a
--- /dev/null
+++ b/metadata/org.hystudio.android.dosbox/assembly.patch
@@ -0,0 +1,31 @@
+Index: jni/jpeg/jidctfst.S
+===================================================================
+--- a/jni/jpeg/jidctfst.S	(revision 115)
++++ b/jni/jpeg/jidctfst.S	(working copy)
+@@ -63,7 +63,7 @@
+ 
+ 
+ jpeg_idct_ifast:
+-    PLD     (r2, #0)
++    PLD     [r2, #0]
+     stmdb   sp!, {r4,r5, r6,r7, r8,r9, r10,r11, r12,lr}
+     ldr     r4, [sp, #4*10]
+     sub     sp, #local_SIZE
+@@ -256,7 +256,7 @@
+ 
+ HLoopStart:
+     // reset pointers
+-    PLD     (sp, #off_WORKSPACE)
++    PLD     [sp, #off_WORKSPACE]
+     add     ip, sp, #off_WORKSPACE
+     ldr     r10, local_RANGE_TABLE
+ 
+@@ -268,7 +268,7 @@
+     str      r0, local_OUTPUT_BUF
+     add      fp, r2, r1
+ 
+-    PLD      (ip, #32)
++    PLD      [ip, #32]
+     ldmia    ip!, {r0-r7}
+ 
+     cmp      r1, #0
diff --git a/metadata/org.hystudio.android.dosbox/format-security.patch b/metadata/org.hystudio.android.dosbox/format-security.patch
new file mode 100644
index 0000000000..a270c5037b
--- /dev/null
+++ b/metadata/org.hystudio.android.dosbox/format-security.patch
@@ -0,0 +1,13 @@
+Index: jni/sdl-1.3/src/video/android/SDL_fake_stdout.c
+===================================================================
+--- a/jni/sdl-1.3/src/video/android/SDL_fake_stdout.c	(revision 115)
++++ b/jni/sdl-1.3/src/video/android/SDL_fake_stdout.c	(working copy)
+@@ -34,7 +34,7 @@
+ 	*/
+ 	return_value = vsnprintf(buff, sizeof(buff), fmt, ap);
+ 	va_end(ap);
+-	__android_log_print(ANDROID_LOG_INFO, "libSDL", buff);
++	__android_log_print(ANDROID_LOG_INFO, "libSDL", "%s", buff);
+ 	//delete buff;
+ 	return return_value;
+ }
diff --git a/metadata/org.ironrabbit.bhoboard.txt b/metadata/org.ironrabbit.bhoboard.txt
index 86246abe98..89d037a09e 100644
--- a/metadata/org.ironrabbit.bhoboard.txt
+++ b/metadata/org.ironrabbit.bhoboard.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/bho
-Source Code:http://code.google.com/p/bho/source/list
-Issue Tracker:http://code.google.com/p/bho/issues/list
+Source Code:http://code.google.com/p/bho/source
+Issue Tracker:http://code.google.com/p/bho/issues
 
 Auto Name:Tibetan Keyboard
 Summary:Keyboard for Tibetan script
@@ -14,12 +14,18 @@ Good for use with [[org.ironrabbit]].
 Repo Type:srclib
 Repo:Bho
 
-Build Version:0.0.7a,8,9c53821c,subdir=BhoBoard,\
-update=.;../TibetanTextLibrary,prebuild=rm -rf ../TibTxt/releases
+Build:0.0.7a,8
+    commit=9c53821c
+    subdir=BhoBoard
+    update=.;../TibetanTextLibrary
+    prebuild=rm -rf ../TibTxt/releases
+
+Build:0.2,12
+    commit=d0c79eebcdc0
+    subdir=BhoBoard
 
 Auto Update Mode:
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.0.7a
-Current Version Code:8
+Update Check Mode:RepoManifest
+Current Version:0.2
+Current Version Code:12
 
diff --git a/metadata/org.ironrabbit.txt b/metadata/org.ironrabbit.txt
index fa5aa10930..8056d8136b 100644
--- a/metadata/org.ironrabbit.txt
+++ b/metadata/org.ironrabbit.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/bho
-Source Code:http://code.google.com/p/bho/source/list
-Issue Tracker:http://code.google.com/p/bho/issues/list
+Source Code:http://code.google.com/p/bho/source
+Issue Tracker:http://code.google.com/p/bho/issues
 
 Auto Name:Tibetan Pad
 Summary:Read Tibetan script
@@ -25,9 +25,7 @@ cp $$Jericho$$/compile-time-dependencies/* libs/ && \
 cp -r $$Jericho$$/src/java/net src/
 
 Auto Update Mode:
-#Update Check Mode:RepoManifest
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.0.6
 Current Version Code:6
 
diff --git a/metadata/org.jamienicol.episodes.txt b/metadata/org.jamienicol.episodes.txt
index ee7e60ab5d..15028e77c6 100644
--- a/metadata/org.jamienicol.episodes.txt
+++ b/metadata/org.jamienicol.episodes.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/jamienicol/episodes
@@ -18,6 +18,9 @@ Repo:https://github.com/jamienicol/episodes
 Build Version:0.2,2,v0.2
 Build Version:0.3,3,v0.3
 
+Build:0.4,4
+    commit=v0.4
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.4
diff --git a/metadata/org.jessies.dalvikexplorer.txt b/metadata/org.jessies.dalvikexplorer.txt
index c4470db4ec..9e531cca22 100644
--- a/metadata/org.jessies.dalvikexplorer.txt
+++ b/metadata/org.jessies.dalvikexplorer.txt
@@ -1,8 +1,8 @@
-Category:Development
+Categories:Development
 License:GPLv3
 Web Site:https://code.google.com/p/enh/wiki/DalvikExplorer
-Source Code:https://code.google.com/p/enh/source/list
-Issue Tracker:https://code.google.com/p/enh/issues/list
+Source Code:https://code.google.com/p/enh/source
+Issue Tracker:https://code.google.com/p/enh/issues
 
 Auto Name:Dalvik Explorer
 Summary:System info
@@ -12,17 +12,39 @@ java.util.Locales, or java.util.TimeZones are available to your app on a specifi
 (Also useful for debugging problems users in other territories are experiencing.)
 .
 
-Repo Type:svn
-Repo:http://enh.googlecode.com/svn/trunk
+Repo Type:git-svn
+Repo:http://enh.googlecode.com/svn/trunk/dalvik-explorer
 
-Build Version:3.3,33,624,target=android-16,subdir=dalvik-explorer
-Build Version:3.4,34,642,target=android-16,subdir=dalvik-explorer
-Build Version:3.5,35,655,target=android-17,subdir=dalvik-explorer
-Build Version:3.6,36,659,target=android-17,subdir=dalvik-explorer
+Build:3.3,33
+    commit=624
+    target=android-16
+
+Build:3.4,34
+    commit=642
+    target=android-16
+
+Build:3.5,35
+    commit=655
+    target=android-17
+
+Build:3.6,36
+    commit=659
+    target=android-17
+
+Build:3.7,37
+    commit=706
+    target=android-18
+
+Build:3.8,38
+    commit=713
+    target=android-18
+
+Build:3.9,39
+    commit=716
+    target=android-19
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:3.6
-Current Version Code:36
+Update Check Mode:RepoManifest
+Current Version:3.9
+Current Version Code:39
 
diff --git a/metadata/org.jessies.mathdroid.txt b/metadata/org.jessies.mathdroid.txt
index 20f8878054..1b33e8dd27 100644
--- a/metadata/org.jessies.mathdroid.txt
+++ b/metadata/org.jessies.mathdroid.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://code.google.com/p/enh/wiki/Mathdroid
-Source Code:https://code.google.com/p/enh/source/checkout
-Issue Tracker:https://code.google.com/p/enh/issues/list
+Source Code:https://code.google.com/p/enh/source
+Issue Tracker:https://code.google.com/p/enh/issues
 
 Auto Name:Mathdroid
 Summary:Calculator
@@ -10,29 +10,25 @@ Description:
 A calculator with full on-screen history and many functions.
 .
 
-# pre-2.9.2 builds would need to be adapted to work with latest fdroid tools
 Repo Type:git-svn
-Repo:http://enh.googlecode.com/svn/trunk
+Repo:http://enh.googlecode.com/svn/trunk/mathdroid
 
-Build Version:2.5,25,525,oldsdkloc=yes,target=android-10,subdir=mathdroid,prebuild=rm -rf src/org/jessies/test && mkdir src/org/jessies/test && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
-Build Version:2.6,26,583,oldsdkloc=yes,target=android-16,subdir=mathdroid,prebuild=rm -rf src/org/jessies/test && mkdir src/org/jessies/test && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
-Build Version:2.7,27,631,oldsdkloc=yes,target=android-16,subdir=mathdroid,prebuild=rm -rf src/org/jessies/test && mkdir src/org/jessies/test && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
-Build Version:2.8,28,645,oldsdkloc=yes,target=android-17,subdir=mathdroid,prebuild=rm -rf src/org/jessies/test/* && \
-wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Assert.java -O src/org/jessies/test/Assert.java && \
-wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/Test.java -O src/org/jessies/test/Test.java && \
-wget http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test/TestHelper.java -O src/org/jessies/test/TestHelper.java
-Build Version:2.9.2,292,675,target=android-17,\
-subdir=mathdroid,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g' AndroidManifest.xml && cd src/org/jessies/ && rm test && \
-svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test
-Build Version:2.9.3,293,682,target=android-17,\
-subdir=mathdroid,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\
-android:minSdkVersion=\"4\"/g' AndroidManifest.xml && cd src/org/jessies/ && rm test && \
-svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test
+Build:2.9.2,292
+    commit=675
+    target=android-17
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g' AndroidManifest.xml && \
+        cd src/org/jessies/ && rm test && \
+        svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test
+
+Build:2.9.3,293
+    commit=682
+    target=android-17
+    prebuild=sed -i 's/android:minSdkVersion=\"3\"/android:minSdkVersion=\"4\"/g' AndroidManifest.xml && \
+        cd src/org/jessies/ && rm test && \
+        svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.9.3
 Current Version Code:293
 
diff --git a/metadata/org.jf.Penroser.txt b/metadata/org.jf.Penroser.txt
index d04d61aa40..c509676c83 100644
--- a/metadata/org.jf.Penroser.txt
+++ b/metadata/org.jf.Penroser.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:BSD/Apache
 Web Site:https://github.com/JesusFreke/Penroser/
 Source Code:https://github.com/JesusFreke/Penroser
diff --git a/metadata/org.jfedor.frozenbubble.txt b/metadata/org.jfedor.frozenbubble.txt
index eb577ef770..24e21d974f 100644
--- a/metadata/org.jfedor.frozenbubble.txt
+++ b/metadata/org.jfedor.frozenbubble.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://code.google.com/p/frozenbubbleandroid/
-Source Code:http://code.google.com/p/frozenbubbleandroid/source/checkout
-Issue Tracker:http://code.google.com/p/frozenbubbleandroid/issues/list
+Source Code:http://code.google.com/p/frozenbubbleandroid/source
+Issue Tracker:http://code.google.com/p/frozenbubbleandroid/issues
 
 Auto Name:Frozen Bubble
 Summary:Bubble shooting game
@@ -14,28 +14,69 @@ or more bubbles.
 Repo Type:git-svn
 Repo:http://frozenbubbleandroid.googlecode.com/svn/
 
-Build Version:1.7,8,15
-Build Version:1.8,9,16
-Build Version:1.10,11,18
-Build Version:1.11,12,19
-Build Version:1.12,13,20
-Build Version:1.13,14,25,buildjni=yes
-Build Version:1.14,15,30,buildjni=yes
-Build Version:1.15,16,32,buildjni=yes
-Build Version:1.16,17,40,buildjni=yes
-Build Version:1.17,18,49,buildjni=yes
-Build Version:1.18,19,50,buildjni=yes
-Build Version:1.19,20,52,buildjni=yes
-Build Version:1.20,21,58,\
-prebuild=sed -i '156s/true/false/g;448s/true/false/g' \
-           src/org/jfedor/frozenbubble/FrozenBubble.java && \
-         sed -i '68s/true/false/g;118s/true/false/g' \
-           src/com/efortin/frozenbubble/PreferencesActivity.java,\
-buildjni=yes
+Build:1.7,8
+    commit=15
+
+Build:1.8,9
+    commit=16
+
+Build:1.10,11
+    commit=18
+
+Build:1.11,12
+    commit=19
+
+Build:1.12,13
+    commit=20
+
+Build:1.13,14
+    commit=25
+    buildjni=yes
+
+Build:1.14,15
+    commit=30
+    buildjni=yes
+
+Build:1.15,16
+    commit=32
+    buildjni=yes
+
+Build:1.16,17
+    commit=40
+    buildjni=yes
+
+Build:1.17,18
+    commit=49
+    buildjni=yes
+
+Build:1.18,19
+    commit=50
+    buildjni=yes
+
+Build:1.19,20
+    commit=52
+    buildjni=yes
+
+Build:1.20,21
+    commit=58
+    prebuild=sed -i '156s/true/false/g;448s/true/false/g' src/org/jfedor/frozenbubble/FrozenBubble.java && \
+        sed -i '68s/true/false/g;118s/true/false/g' src/com/efortin/frozenbubble/PreferencesActivity.java
+    buildjni=yes
+
+Build:1.21,22
+    commit=64
+    prebuild=sed -i '156s/true/false/g;448s/true/false/g' src/org/jfedor/frozenbubble/FrozenBubble.java && \
+        sed -i '68s/true/false/g;118s/true/false/g' src/com/efortin/frozenbubble/PreferencesActivity.java
+    buildjni=yes
+
+Build:1.22,23
+    commit=65
+    prebuild=sed -i '156s/true/false/g;450s/true/false/g' src/org/jfedor/frozenbubble/FrozenBubble.java && \
+        sed -i '68s/true/false/g;118s/true/false/g' src/com/efortin/frozenbubble/PreferencesActivity.java
+    buildjni=yes
 
 Auto Update Mode:None
-# also on gplay
 Update Check Mode:RepoManifest
-Current Version:1.20
-Current Version Code:21
+Current Version:1.22
+Current Version Code:23
 
diff --git a/metadata/org.jfedor.nxtremotecontrol.txt b/metadata/org.jfedor.nxtremotecontrol.txt
index fc69dac2c0..46d4e6197f 100644
--- a/metadata/org.jfedor.nxtremotecontrol.txt
+++ b/metadata/org.jfedor.nxtremotecontrol.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://code.google.com/p/nxt-remote-control/
-Source Code:http://code.google.com/p/nxt-remote-control/source/list
-Issue Tracker:http://code.google.com/p/nxt-remote-control/issues/list
+Source Code:http://code.google.com/p/nxt-remote-control/source
+Issue Tracker:http://code.google.com/p/nxt-remote-control/issues
 
 Auto Name:NXT Remote Control
 Summary:Control Lego robots
@@ -18,8 +18,7 @@ Repo:http://nxt-remote-control.googlecode.com/svn/trunk/
 Build Version:1.4,5,9
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4
 Current Version Code:5
 
diff --git a/metadata/org.jmoyer.NotificationPlus.txt b/metadata/org.jmoyer.NotificationPlus.txt
index b974dc5789..2679617971 100644
--- a/metadata/org.jmoyer.NotificationPlus.txt
+++ b/metadata/org.jmoyer.NotificationPlus.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/notification-plus/
-Source Code:https://code.google.com/p/notification-plus/source/browse/
-Issue Tracker:https://code.google.com/p/notification-plus/issues/list
+Source Code:https://code.google.com/p/notification-plus/source
+Issue Tracker:https://code.google.com/p/notification-plus/issues
 
 Auto Name:Notification Plus
 Summary:Recurring acoustic notifications
@@ -15,11 +15,11 @@ such as the Nexus S, and at least two of the Galaxy S variants.
 Repo Type:hg
 Repo:https://code.google.com/p/notification-plus/
 
-Build Version:1.1,2,396686558905
+Build:1.1,2
+    commit=v1.1
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/org.johanhil.flygtider.txt b/metadata/org.johanhil.flygtider.txt
deleted file mode 100644
index 9fd9a4dbd0..0000000000
--- a/metadata/org.johanhil.flygtider.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Disabled:No source for current version and long in the tooth
-Category:Office
-License:Apache2
-Web Site:http://code.google.com/p/flygtider/
-Source Code:http://code.google.com/p/flygtider/source/checkout
-Issue Tracker:http://code.google.com/p/flygtider/issues/list
-
-Auto Name:Flygtider
-Summary:Flight info for Swedish airports
-Description:
-Flygtider is an Android application that lists information about flights
-arriving to/departing from most Swedish airports.
-.
-
-Repo Type:svn
-Repo:http://flygtider.googlecode.com/svn/trunk
-
-# Several versions, including the one available in the market, are
-# missing from the Subversion repository.
-Build Version:0.7,9,23
-Build Version:0.61,8,!This version was never committed
-
-Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.61
-Current Version Code:8
-
diff --git a/metadata/org.jsharkey.sky.txt b/metadata/org.jsharkey.sky.txt
index 5aaa2dc9bc..4807565ce2 100644
--- a/metadata/org.jsharkey.sky.txt
+++ b/metadata/org.jsharkey.sky.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/android-sky/
-Source Code:http://code.google.com/p/android-sky/source/checkout
-Issue Tracker:http://code.google.com/p/android-sky/issues/list
+Source Code:http://code.google.com/p/android-sky/source
+Issue Tracker:http://code.google.com/p/android-sky/issues
 
 Auto Name:Forecast widgets
 Summary:Weather Widget
diff --git a/metadata/org.jtb.alogcat.txt b/metadata/org.jtb.alogcat.txt
index 401570bb3a..aef8be68b3 100644
--- a/metadata/org.jtb.alogcat.txt
+++ b/metadata/org.jtb.alogcat.txt
@@ -1,8 +1,8 @@
-Category:Development
+Categories:Development
 License:GPLv3
 Web Site:http://code.google.com/p/alogcat/
-Source Code:http://code.google.com/p/alogcat/source/checkout
-Issue Tracker:http://code.google.com/p/alogcat/issues/list
+Source Code:http://code.google.com/p/alogcat/source
+Issue Tracker:http://code.google.com/p/alogcat/issues
 
 Auto Name:aLogcat
 Summary:System and app log viewer
@@ -27,8 +27,7 @@ Build Version:2.5,40,41,prebuild=find . -type f -name \*.java -print0 | xargs -0
 Build Version:2.6.1,43,48,prebuild=find . -type f -name \*.java -print0 | xargs -0 sed -i "s/^import org\.jtb\.alogcat\.donate\.R;$/import org.jtb.alogcat.R;/g" && sed -i "s/org.jtb.alogcat.donate/org.jtb.alogcat/" AndroidManifest.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.6.1
 Current Version Code:43
 
diff --git a/metadata/org.jtb.droidlife.txt b/metadata/org.jtb.droidlife.txt
index 2597d1cd18..47559984cf 100644
--- a/metadata/org.jtb.droidlife.txt
+++ b/metadata/org.jtb.droidlife.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/droidlife/
-Source Code:http://code.google.com/p/droidlife/source/checkout
-Issue Tracker:http://code.google.com/p/droidlife/issues/list
+Source Code:http://code.google.com/p/droidlife/source
+Issue Tracker:http://code.google.com/p/droidlife/issues
 
 Auto Name:DroidLife
 Summary:Conway's Game of Life
@@ -13,12 +13,16 @@ An implementation of Conway's Game of Life.
 Repo Type:git-svn
 Repo:http://droidlife.googlecode.com/svn/trunk/
 
-Build Version:2.4.1,21,22
-Build Version:2.5,22,23
+Build:2.4.1,21
+    commit=22
+    init=rm -rf release/
+
+Build:2.5,22
+    commit=23
+    init=rm -rf release/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.5
 Current Version Code:22
 
diff --git a/metadata/org.jtb.httpmon.txt b/metadata/org.jtb.httpmon.txt
index d2487e576c..dc1fe65b96 100644
--- a/metadata/org.jtb.httpmon.txt
+++ b/metadata/org.jtb.httpmon.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/httpmon/
-Source Code:http://code.google.com/p/httpmon/source/checkout
-Issue Tracker:http://code.google.com/p/httpmon/issues/list
+Source Code:http://code.google.com/p/httpmon/source
+Issue Tracker:http://code.google.com/p/httpmon/issues
 
 Auto Name:httpmon
 Summary:HTTP monitor
@@ -15,10 +15,10 @@ Repo Type:git-svn
 Repo:http://httpmon.googlecode.com/svn/trunk/
 
 Build Version:0.4.9,26,53,prebuild=rm -rf release/
+Build Version:0.4.10,27,54
 
 Auto Update Mode:None
-#Build Version:0.4.10,27,!wait for client 54,prebuild=rm -rf release/
-Update Check Mode:Static
+Update Check Mode:RepoManifest
 Current Version:0.4.10
 Current Version Code:27
 
diff --git a/metadata/org.katsarov.dofcalc.txt b/metadata/org.katsarov.dofcalc.txt
index 31e22d7018..e5cd9b31cf 100644
--- a/metadata/org.katsarov.dofcalc.txt
+++ b/metadata/org.katsarov.dofcalc.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3+
 Web Site:http://code.webface.bg/dof-calculator.html
 Source Code:http://code.webface.bg/dof-calculator.html
diff --git a/metadata/org.kde.kdeconnect_tp.txt b/metadata/org.kde.kdeconnect_tp.txt
new file mode 100644
index 0000000000..f03bb80365
--- /dev/null
+++ b/metadata/org.kde.kdeconnect_tp.txt
@@ -0,0 +1,41 @@
+Categories:System
+License:GPLv2
+Web Site:http://albertvaka.wordpress.com/
+Source Code:http://quickgit.kde.org/?p=kdeconnect-android.git
+Issue Tracker:https://bugs.kde.org/
+
+Auto Name:KDE Connect
+Summary:KDE Integration
+Description:
+Integrate Android and KDE in order to receive notifications from the phone
+(calls, SMS, etc.), share the clipboard, transfer files or control KDE
+multimedia applications.
+
+Note: This is an unstable 'tech preview'.
+.
+
+Repo Type:git
+Repo:git://anongit.kde.org/kdeconnect-android
+
+Build:0.3.0,5
+    commit=v0.3
+    subdir=KdeConnect
+    gradle=yes
+
+Build:0.4,9
+    commit=v0.4
+    gradle=yes
+
+Build:0.4.1,10
+    commit=v0.4.1
+    gradle=yes
+
+Build:0.4.2,11
+    commit=v0.4.2
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.4.2
+Current Version Code:11
+
diff --git a/metadata/org.kde.ministro.config.txt b/metadata/org.kde.ministro.config.txt
index b9579676f6..8afdf9ae4f 100644
--- a/metadata/org.kde.ministro.config.txt
+++ b/metadata/org.kde.ministro.config.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://community.kde.org/Necessitas
 Source Code:http://quickgit.kde.org/?p=ministro.git
diff --git a/metadata/org.kde.necessitas.ministro.txt b/metadata/org.kde.necessitas.ministro.txt
index 994e35d31b..396e12d2d6 100644
--- a/metadata/org.kde.necessitas.ministro.txt
+++ b/metadata/org.kde.necessitas.ministro.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:http://community.kde.org/Necessitas
 Source Code:http://quickgit.kde.org/?p=ministro.git
diff --git a/metadata/org.kiwix.kiwixmobile.txt b/metadata/org.kiwix.kiwixmobile.txt
index 3e88111bb3..55a2942f6a 100644
--- a/metadata/org.kiwix.kiwixmobile.txt
+++ b/metadata/org.kiwix.kiwixmobile.txt
@@ -1,31 +1,40 @@
-Category:Internet
-License:GPLv3+
-Web Site:http://www.kiwix.org/wiki/Main_Page
-Source Code:http://sourceforge.net/p/kiwix/kiwix
-Issue Tracker:http://sourceforge.net/p/kiwix/bugs
+Categories:Internet
+License:GPLv3
+Web Site:http://www.kiwix.org/
+Source Code:http://sourceforge.net/projects/kiwix/
+Issue Tracker:http://sourceforge.net/p/kiwix/bugs/
 
 Auto Name:Kiwix
-Summary:Offline content reader
+Summary:Offline Wikipedia reader
 Description:
-Kiwix is an offline content reader which can be used for Wikipedia as well as
-other contents (Ubuntu documentation, WikiLeaks, WikiSource, etc).
-Once you have downloaded the content file (potentially very large), you don't
-need any connection to use it.
-Kiwix is a lightweight software reading ZIM files which you download and store
-on your device or external storage (SD card).
+Kiwix lets you read Wikipedia and other websites without an Internet
+connection. It uses the highly compressed [http://www.openzim.org/ ZIM format]
+to store webpages for quick and easy reading.
 .
 
 Repo Type:git
 Repo:git://git.code.sf.net/p/kiwix/kiwix
 
-Build Version:1.2,5,!WIP 1.2-on-google-play,subdir=android,prebuild=rm -rf ../src/sugar,prebuild=\
-cd .. && ./autogen.sh && ./configure --disable-staticbins --disable-manager --disable-server \
---disable-launcher --disable-indexer --disable-installer --disable-searcher --disable-reader \
---disable-components --enable-android && cd src/dependencies && make xz && cd ../../android && \
-NDK_PATH=$$NDK$$ ANDROID_HOME=$$SDK$$ ./build-android-with-native.py --toolchain --lzma --zim --kiwix --strip
+Build:1.6,1
+    disable=Doesn't build - lots of errors
+    commit=78a24139f13f2d73ba601e54a393bdc437cbeccb
+    subdir=android
+    prebuild=rm -rf ../src/sugar && \
+        cd .. && \
+        ./autogen.sh && \
+        ./configure --enable-android && \
+        cd src/dependencies && \
+        make all
+    build=NDK_PATH=$$NDK$$ && \
+        ANDROID_HOME=$$SDK$$ && \
+        ./build-android-with-native.py --toolchain --lzma --zim --kiwix --strip
 
-Auto Update Mode:
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:3
+Maintainer Notes:
+Used to be tagged, but none are recent. RepoManifest is newer than current release.
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.9
+Current Version Code:16
 
diff --git a/metadata/org.kontalk.txt b/metadata/org.kontalk.txt
index 12d800239d..95e9fe0ea7 100644
--- a/metadata/org.kontalk.txt
+++ b/metadata/org.kontalk.txt
@@ -1,7 +1,7 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
-Web Site:http://www.kontalk.org/
-Source Code:http://code.google.com/p/kontalk.androidclient
+Web Site:http://www.kontalk.org
+Source Code:http://code.google.com/p/kontalk.androidclient/source
 Issue Tracker:http://code.google.com/p/kontalk/issues
 Donate:http://www.kontalk.net/
 Bitcoin:14vipppSvCG7VdvoYmbhKZ8DbTfv9U1QfS
@@ -27,39 +27,72 @@ for sending you the verification code, then it will be discarded.
 Repo Type:git
 Repo:https://code.google.com/p/kontalk.androidclient/
 
-Build Version:2.2.5,21,2.2.5,submodules=no,srclibs=ActionBarSherlock@4.2.0,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz" && \
-tar -xzf protobuf-2.4.1.tar.gz && cd protobuf-2.4.1 && ./configure && make && \
-cd java && $$MVN3$$ package -P lite && cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
-cd ../../ && rm -rf protobuf-2.4.1*
-Build Version:2.2.6,23,2.2.6,submodules=no,srclibs=ActionBarSherlock@4.2.0,\
-prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz",build=\
-tar -xzf protobuf-2.4.1.tar.gz && cd protobuf-2.4.1 && ./configure && make && \
-cd java && $$MVN3$$ package -P lite && cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
-cd ../../ && rm -rf protobuf-2.4.1*
-Build Version:2.2.7,24,2.2.7,submodules=no,srclibs=ActionBarSherlock@4.2.0,\
-prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz",build=\
-tar -xzf protobuf-2.4.1.tar.gz && cd protobuf-2.4.1 && ./configure && make && \
-cd java && $$MVN3$$ package -P lite && cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
-cd ../../ && rm -rf protobuf-2.4.1*
-Build Version:2.2.8,25,2.2.8,submodules=no,srclibs=ActionBarSherlock@4.4.0,\
-prebuild=\
-  sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-  cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-  wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz",\
-build=\
-  tar -xzf protobuf-2.4.1.tar.gz && cd protobuf-2.4.1 && ./configure && make && \
-  cd java && $$MVN3$$ package -P lite && cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
-  cd ../../ && rm -rf protobuf-2.4.1*
+Build:2.2.5,21
+    commit=2.2.5
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz" && \
+        tar -xzf protobuf-2.4.1.tar.gz && \
+        cd protobuf-2.4.1 && \
+        ./configure && \
+        make && \
+        cd java && \
+        $$MVN3$$ package -P lite && \
+        cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
+        cd ../../ && \
+        rm -rf protobuf-2.4.1*
+
+Build:2.2.6,23
+    commit=2.2.6
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz"
+    build=tar -xzf protobuf-2.4.1.tar.gz && \
+        cd protobuf-2.4.1 && \
+        ./configure && \
+        make && \
+        cd java && \
+        $$MVN3$$ package -P lite && \
+        cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
+        cd ../../ && \
+        rm -rf protobuf-2.4.1*
+
+Build:2.2.7,24
+    commit=2.2.7
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz"
+    build=tar -xzf protobuf-2.4.1.tar.gz && \
+        cd protobuf-2.4.1 && \
+        ./configure && \
+        make && \
+        cd java && \
+        $$MVN3$$ package -P lite && \
+        cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
+        cd ../../ && \
+        rm -rf protobuf-2.4.1*
+
+Build:2.2.8,25
+    commit=2.2.8
+    srclibs=ActionBarSherlock@4.4.0
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        wget "http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz"
+    build=tar -xzf protobuf-2.4.1.tar.gz && \
+        cd protobuf-2.4.1 && \
+        ./configure && \
+        make && \
+        cd java && \
+        $$MVN3$$ package -P lite && \
+        cp target/protobuf-java-2.4.1-lite.jar ../../libs/ && \
+        cd ../../ && \
+        rm -rf protobuf-2.4.1*
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.2.8
-Current Version Code:25
+Current Version:2.2.9
+Current Version Code:26
 
diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt
index 0d37ec91b5..e6e1bdedea 100644
--- a/metadata/org.kost.externalip.txt
+++ b/metadata/org.kost.externalip.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://code.google.com/p/external-ip/
-Source Code:https://code.google.com/p/external-ip/source/checkout
-Issue Tracker:https://code.google.com/p/external-ip/issues/list
+Source Code:https://code.google.com/p/external-ip/source
+Issue Tracker:https://code.google.com/p/external-ip/issues
 
 Auto Name:External IP
 Summary:Display your IP addresses
diff --git a/metadata/org.kreed.vanilla.txt b/metadata/org.kreed.vanilla.txt
index e9c32420b8..be3aba9196 100644
--- a/metadata/org.kreed.vanilla.txt
+++ b/metadata/org.kreed.vanilla.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:MIT
 Web Site:https://github.com/kreed/vanilla
 Source Code:https://github.com/kreed/vanilla
diff --git a/metadata/org.kwaak3.txt b/metadata/org.kwaak3.txt
index 72f23d9cea..bfa2486800 100644
--- a/metadata/org.kwaak3.txt
+++ b/metadata/org.kwaak3.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://code.google.com/p/kwaak3/
-Source Code:http://code.google.com/p/kwaak3/source/checkout
-Issue Tracker:http://code.google.com/p/kwaak3/issues/list
+Source Code:http://code.google.com/p/kwaak3/source
+Issue Tracker:http://code.google.com/p/kwaak3/issues
 
 Auto Name:Kwaak3
 Summary:Quake 3 for Android
diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt
index 531b9f9d1c..a824c645ff 100644
--- a/metadata/org.liberty.android.fantastischmemo.txt
+++ b/metadata/org.liberty.android.fantastischmemo.txt
@@ -1,9 +1,9 @@
-Category:Science & Education
+Categories:Science & Education
 # GPLv2 not compatible with jars
 License:GPL
 Web Site:http://anymemo.org/
-Source Code:https://github.com/helloworld1/AnyMemo
-Issue Tracker:http://code.google.com/p/anymemo/issues/list
+Source Code:http://code.google.com/p/anymemo/source
+Issue Tracker:http://code.google.com/p/anymemo/issues
 Donate:http://anymemo.org/
 
 Auto Name:AnyMemo
@@ -20,20 +20,53 @@ revealed or read out by touching the panel below the question.
 .
 
 Repo Type:git
-Repo:https://github.com/helloworld1/AnyMemo.git
+Repo:https://code.google.com/p/anymemo
+
+Build:8.3.0,135
+    commit=a591497118fe2cae101027add50d835c7fe6ed27
+    target=android-13
+    prebuild=rm -rf jni/
+
+Build:8.3.1,136
+    disable=No source in repo
+    commit=unknown - see disabled
+
+Build:9.0.10,160
+    disable=Build problem - see http://anymemo.org/bugzilla/show_bug.cgi?id=279
+    commit=746af8db0f349577
+    target=android-15
+    prebuild=rm -rf jni/
+
+Build:9.1.2,168
+    disable=!No source in repo
+    commit=unknown - see disabled
+
+Build:10.0.1,176
+    disable=Requires Java 1.6.0_24+ because of ormlite errors
+    commit=42b40c7b9d24648
+    target=android-16
+    prebuild=rm -rf jni/
 
-Build Version:8.3.0,135,a591497118fe2cae101027add50d835c7fe6ed27,target=android-13,prebuild=rm -rf jni/
-Build Version:8.3.1,136,!No source in repo
-Build Version:9.0.10,160,!Build problem - see http://anymemo.org/bugzilla/show_bug.cgi?id=279 (rev 746af8db0f349577),target=android-15,prebuild=rm -rf jni/
-Build Version:9.1.2,168,!No source in repo
-Build Version:10.0.1,176,!Requires Java 1.6.0_24+ because of ormlite errors (at 42b40c7b9d24648),target=android-16,prebuild=rm -rf jni/
 # Works with a recent shift to openjdk7
-Build Version:10.2,182,2e9e1b06f9,init=rm -rf bin/ gen/ jni/ obsolete/,target=android-16
-Build Version:10.2.991,183,!beta
+Build:10.2,182
+    commit=2e9e1b06f9
+    init=rm -rf bin/ gen/ jni/ obsolete/
+    target=android-16
+
+Build:10.2.991,183
+    disable=beta
+
+Build:10.3,188
+    commit=10.3
+    init=rm -rf bin/ gen/ jni/ obsolete/
+    target=android-16
+
+Build:10.3.991,196
+    disable=beta
 
 Auto Update Mode:None
 # See Issue tracker for apks
-Update Check Mode:RepoManifest
-Current Version:10.2.993
-Current Version Code:187
+Update Check Mode:Tags
+Current Version:10.3.991
+Current Version Code:196
 
diff --git a/metadata/org.ligi.fast.txt b/metadata/org.ligi.fast.txt
index 72b88d1a91..a09524c89f 100644
--- a/metadata/org.ligi.fast.txt
+++ b/metadata/org.ligi.fast.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/ligi/FAST/
 Source Code:https://github.com/ligi/FAST
@@ -19,19 +19,54 @@ Works as a normal app or a launcher.
 Repo Type:git
 Repo:https://github.com/ligi/FAST.git
 
-Build Version:1.8,18,2436e89b3,prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5
-Build Version:1.9,19,! no source code
-Build Version:2.9,29,2.9,target=android-17,init=rm libs/android-support-v13.jar,\
-extlibs=android/android-support-v13.jar,prebuild=rm -rf promo
-Build Version:3.3,33,3.3,target=android-17,init=rm libs/android-support-v13.jar,\
-extlibs=android/android-support-v13.jar,prebuild=rm -rf promo
-Build Version:3.7,37,3.7,target=android-17,init=rm libs/android-support-v13.jar,\
-extlibs=android/android-support-v13.jar,prebuild=rm -rf promo
-Build Version:4.2,42,4.2,subdir=app,gradle=forFDroid
-Build Version:4.3,43,4.3,subdir=app,gradle=forFDroid
+Build:1.8,18
+    commit=2436e89b3
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=echo "android.library.reference.1=$$ActionBarSherlock$$" >> project.properties
+
+Build:1.9,19
+    disable=no source code
+    commit=unknown - see disabled
+
+Build:2.9,29
+    commit=2.9
+    init=rm libs/android-support-v13.jar
+    target=android-17
+    extlibs=android/android-support-v13.jar
+    prebuild=rm -rf promo
+
+Build:3.3,33
+    commit=3.3
+    init=rm libs/android-support-v13.jar
+    target=android-17
+    extlibs=android/android-support-v13.jar
+    prebuild=rm -rf promo
+
+Build:3.7,37
+    commit=3.7
+    init=rm libs/android-support-v13.jar
+    target=android-17
+    extlibs=android/android-support-v13.jar
+    prebuild=rm -rf promo
+
+Build:4.2,42
+    commit=4.2
+    subdir=app
+    gradle=forFDroid
+
+Build:4.3,43
+    commit=4.3
+    subdir=app
+    gradle=forFDroid
+
+Build:4.9,49
+    commit=4.9
+    subdir=android
+    gradle=forFDroid
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:4.3
-Current Version Code:43
+Current Version:4.9
+Current Version Code:49
 
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index 71468fdb70..206e753e7b 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://www.linphone.org
 Source Code:http://www.linphone.org/eng/download/git.html
@@ -21,47 +21,48 @@ Description:
 Repo Type:git
 Repo:git://git.linphone.org/linphone-android.git
 
-Build Version:2.0.3-fdroid,2003,!contains non-free codecs at 2.0.3-1,submodules=no,\
-init=git submodule update --init --recursive,prebuild=\
-rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-echo "version.name=2.0.3-fdroid" > default.properties && \
-sed -i 's/allowBackup=\"true\"/debuggable=\"false\"/g' AndroidManifest.xml && \
-sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile && \
-sed -i 's/markets\">true/markets\">=false/g' \
-res/values/non_localizable_custom.xml,build=\
-make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 \
-BUILD_FOR_X86=1 prepare-sources,buildjni=no
+Build:2.0.3-fdroid,2003
+    disable=contains non-free codecs at 2.0.3-1
+    commit=2.0.3-1
+    init=git submodule update --init --recursive
+    prebuild=rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        echo "version.name=2.0.3-fdroid" > default.properties && \
+        sed -i 's/allowBackup=\"true\"/debuggable=\"false\"/g' AndroidManifest.xml && \
+        sed -i 's@\(NDK_PATH=\).*@\1$$NDK$$@' Makefile && \
+        sed -i 's/markets\">true/markets\">=false/g' res/values/non_localizable_custom.xml
+    build=make BUILD_SILK=0 BUILD_X264=1 BUILD_GPLV3_ZRTP=1 BUILD_FOR_X86=1 prepare-sources
+    buildjni=no
+
 # note the custom_rules ; didn't use a tag because of zrtp security fix
-Build Version:2.1.2-fdroid,2120,846a2a3a58,\
-update=no,\
-init=git submodule update --init --recursive,\
-patch=makefile.patch,\
-prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\n\
-SDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
-         echo 'version.name=2.1.2-fdroid' > default.properties && \
-         rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-         sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
-         sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml,\
-build=make,\
-buildjni=no
-Build Version:2.2.0.2-fdroid,2202,!wip - just needs new makefile patch at 1c3e19eb983,\
-update=no,\
-init=git submodule update --init --recursive,\
-patch=makefile.patch,\
-prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\n\
-SDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
-         echo 'version.name=2.2.0.2-fdroid' > default.properties && \
-         rm -rf tests submodules/externals/webrtc/modules/\
-video_capture/main/source/android/java/org/webrtc/videoengine/* && \
-         sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
-         sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml,\
-build=make,\
-buildjni=no
+Build:2.1.2-fdroid,2120
+    commit=846a2a3a58
+    init=git submodule update --init --recursive
+    update=no
+    patch=makefile.patch
+    prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
+        echo 'version.name=2.1.2-fdroid' > default.properties && \
+        rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
+        sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
+    build=make
+    buildjni=no
+
+Build:2.2.0.2-fdroid,2202
+    disable=wip - just needs new makefile patch at 1c3e19eb983
+    commit=1c3e19eb983
+    init=git submodule update --init --recursive
+    update=no
+    patch=makefile.patch
+    prebuild=sed -i '1 i NDK_PATH=$$NDK$$\nSDK_PATH=$$SDK$$/tools\nSDK_PLATFORM_TOOLS_PATH=$$SDK$$/platform-tools\n' Makefile && \
+        echo 'version.name=2.2.0.2-fdroid' > default.properties && \
+        rm -rf tests submodules/externals/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/* && \
+        sed -i 's/allowBackup="true"/debuggable="false"/g' AndroidManifest.xml && \
+        sed -i 's/markets">true/markets">=false/g' res/values/non_localizable_custom.xml
+    build=make
+    buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.2.0.2
-Current Version Code:2202
+Current Version:Unknown
+Current Version Code:2211
 
diff --git a/metadata/org.logicallycreative.movingpolygons.txt b/metadata/org.logicallycreative.movingpolygons.txt
new file mode 100644
index 0000000000..48e61e5004
--- /dev/null
+++ b/metadata/org.logicallycreative.movingpolygons.txt
@@ -0,0 +1,23 @@
+Categories:Wallpaper
+License:GPLv3
+Web Site:
+Source Code:https://github.com/jagossel/MovingPolygons
+Issue Tracker:https://github.com/jagossel/MovingPolygons/issues
+
+Auto Name:Moving Polygons
+Summary:Bouncing lines live wallpaper
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/jagossel/MovingPolygons.git
+
+Build:1.0.0.3,4
+    commit=v1.0.0.3
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.0.3
+Current Version Code:4
+
diff --git a/metadata/org.lumicall.android.txt b/metadata/org.lumicall.android.txt
index 5ad7b2f720..04da6adaa7 100644
--- a/metadata/org.lumicall.android.txt
+++ b/metadata/org.lumicall.android.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3+
 Web Site:http://www.lumicall.org
 Source Code:https://github.com/opentelecoms-org/lumicall
@@ -40,7 +40,6 @@ prebuild=echo "project.target.apilevel=8" > ant.properties,\
 buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:Tags
 Current Version:1.9.11
 Current Version Code:145
diff --git a/metadata/org.macno.puma.txt b/metadata/org.macno.puma.txt
index 0ab216eaf6..6da74ccb80 100644
--- a/metadata/org.macno.puma.txt
+++ b/metadata/org.macno.puma.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:
 Source Code:https://gitorious.org/puma-droid/puma
@@ -20,16 +20,41 @@ following people or viewing profiles.
 Repo Type:git
 Repo:git://gitorious.org/puma-droid/puma.git
 
-Build Version:0.6,6,0.6
-Build Version:0.7,7,0.7
-Build Version:0.8,8,0.8
-Build Version:0.9,9,0.9
-Build Version:0.10,10,0.10
-Build Version:0.11,11,0.11
-Build Version:0.12,12,0.12
+Build:0.6,6
+    commit=0.6
+
+Build:0.7,7
+    commit=0.7
+
+Build:0.8,8
+    commit=0.8
+
+Build:0.9,9
+    commit=0.9
+
+Build:0.10,10
+    commit=0.10
+
+Build:0.11,11
+    commit=0.11
+
+Build:0.12,12
+    commit=0.12
+
+Build:0.13,13
+    commit=0.13
+
+Build:0.14,14
+    commit=0.14
+
+Build:0.15,15
+    commit=0.15
+
+Build:0.16,16
+    commit=0.16
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.12
-Current Version Code:12
+Current Version:0.16
+Current Version Code:16
 
diff --git a/metadata/org.madore.android.unicodeMap.txt b/metadata/org.madore.android.unicodeMap.txt
index b1bd3b6036..99179c262f 100644
--- a/metadata/org.madore.android.unicodeMap.txt
+++ b/metadata/org.madore.android.unicodeMap.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Public Domain
 Web Site:http://www.madore.org/~david/programs/UnicodeMap.html
 Source Code:http://git.madore.org/?p=android/UnicodeMap.git;a=summary
@@ -18,11 +18,10 @@ whatever.
 Repo Type:git
 Repo:git://git.madore.org/android/UnicodeMap.git
 
-Build Version:0.0.4,4,47f5265e
+Build Version:0.0.4,4,v0.0.4
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.0.4
 Current Version Code:4
 
diff --git a/metadata/org.marcus905.wifi.ace.txt b/metadata/org.marcus905.wifi.ace.txt
index 5494d36ec2..8d53064fc4 100644
--- a/metadata/org.marcus905.wifi.ace.txt
+++ b/metadata/org.marcus905.wifi.ace.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/android-wifi-ace/
-Source Code:http://code.google.com/p/android-wifi-ace/source/checkout
-Issue Tracker:http://code.google.com/p/android-wifi-ace/issues/list
+Source Code:http://code.google.com/p/android-wifi-ace/source
+Issue Tracker:http://code.google.com/p/android-wifi-ace/issues
 
 Name:WiFi ACE
 Auto Name:WiFi Advanced Configuration Editor
@@ -12,15 +12,17 @@ WiFi Advanced Configuration Editor lets you fine tune the settings of your confi
 networks, such as BSSID, ciphers, WEP keys and various WPA options.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://android-wifi-ace.googlecode.com/svn/trunk/WiFiACE
 
-Build Version:0.10,20100924,13
-Build Version:0.11,20120115,14
+Build:0.10,20100924
+    commit=13
+
+Build:0.11,20120115
+    commit=14
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.11
 Current Version Code:20120115
 
diff --git a/metadata/org.mariotaku.twidere.extension.twitlonger.txt b/metadata/org.mariotaku.twidere.extension.twitlonger.txt
index 73e4f7638f..9ed76cd980 100644
--- a/metadata/org.mariotaku.twidere.extension.twitlonger.txt
+++ b/metadata/org.mariotaku.twidere.extension.twitlonger.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/mariotaku/twidere.extension.twitlonger
 Source Code:https://github.com/mariotaku/twidere.extension.twitlonger
diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
index ed9a985303..e6ecf710f4 100644
--- a/metadata/org.mariotaku.twidere.txt
+++ b/metadata/org.mariotaku.twidere.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/mariotaku/twidere
 Source Code:https://github.com/mariotaku/twidere
@@ -34,8 +34,6 @@ For general info about the StatusNet API see
 
 You can donate via PayPal here, with the same address being used for AliPay
 donations.
-
-Status: We can't build the latest versions as we only get build errors.
 .
 
 Repo Type:git
@@ -43,24 +41,143 @@ Repo:git://github.com/mariotaku/twidere.git
 
 # needs Google API to build but also works without Google Maps installed
 # using later commit for 0.1.1 because it includes bugfix
-Build Version:0.1.1,28,4db856984ecb1636daf6c97947dcb49069ec1c11,target=Google Inc.:Google APIs:16
-Build Version:0.1.3,31,5a577b1c0248e0,target=Google Inc.:Google APIs:16
-Build Version:0.1.5,33,b3409715af,target=Google Inc.:Google APIs:16
-Build Version:0.1.6,35,b87d64e197,target=Google Inc.:Google APIs:16
-Build Version:0.1.8,39,4946938d3,target=Google Inc.:Google APIs:16
-Build Version:0.1.9,42,ff62cd1fb,target=Google Inc.:Google APIs:16
-Build Version:0.2.0,47,0.2.0,patch=constants.patch
-Build Version:0.2.0.5,48,!no source
-Build Version:0.2.1,49,0.2.1,prebuild=rm -rf dist/,patch=constants.patch
+Build:0.1.1,28
+    commit=4db856984ecb1636daf6c97947dcb49069ec1c11
+    target=Google Inc.:Google APIs:16
+
+Build:0.1.3,31
+    commit=5a577b1c0248e0
+    target=Google Inc.:Google APIs:16
+
+Build:0.1.5,33
+    commit=b3409715af
+    target=Google Inc.:Google APIs:16
+
+Build:0.1.6,35
+    commit=b87d64e197
+    target=Google Inc.:Google APIs:16
+
+Build:0.1.8,39
+    commit=4946938d3
+    target=Google Inc.:Google APIs:16
+
+Build:0.1.9,42
+    commit=ff62cd1fb
+    target=Google Inc.:Google APIs:16
+
+Build:0.2.0,47
+    commit=0.2.0
+    patch=constants.patch
+
+Build:0.2.0.5,48
+    disable=no source
+    commit=unknown
+
+Build:0.2.1,49
+    commit=0.2.1
+    patch=constants.patch
+    prebuild=rm -rf dist/
+
 # From here on it can't find some symbols that should come fron android-support-v4.jar
-Build Version:0.2.2,50,!build error 0.2.2,prebuild=rm -rf dist/,patch=constants.patch
-Build Version:0.2.8.3,72,!still fails (at eefd4bf2d79f21f0),prebuild=rm -rf dist/ art/,patch=constants1.patch
+Build:0.2.2,50
+    disable=build error
+    commit=0.2.2
+    patch=constants.patch
+    prebuild=rm -rf dist/
+
+Build:0.2.8.3,72
+    disable=still fails
+    commit=eefd4bf2d79f21f0
+    patch=constants1.patch
+    prebuild=rm -rf dist/ art/
+
 # From here on, the api keys are already hard-coded in the source code
-Build Version:0.2.8.6,76,!still fails (at 8b7f5477018d6cc56a),prebuild=rm -rf dist/ art/
-Build Version:0.2.9.1,78,!still fails 0.2.9.1,prebuild=rm -rf dist/ art/
+Build:0.2.8.6,76
+    disable=still fails
+    commit=8b7f5477018d6cc56a
+    prebuild=rm -rf dist/ art/
+
+Build:0.2.9.1,78
+    disable=Fails due to missing symbols - see https://github.com/mariotaku/twidere/issues/74
+    commit=0.2.9.1
+    prebuild=rm -rf dist/ art/
+
+Build:0.2.9.3,79
+    disable=builds but crashes during setup
+    commit=0.2.9.3
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    patch=GooglePlay.patch
+    prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.4,80
+    commit=0.2.9.4
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    patch=GooglePlay.patch
+    prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.5,81
+    commit=0.2.9.5
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.6-update2,84
+    commit=13811314f8ab9f14
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.7-update1,86
+    commit=da803eb75188eb9
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.8-update2,90
+    disable=missing resources
+    commit=b88ae6c3d3
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+
+Build:0.2.9.9,91
+    disable=java problems http://sprunge.us/Zaij
+    commit=8a07f3a809
+    init=rm libs/android-support-v13.jar
+    extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+    srclibs=1:ActionBar-PullToRefresh@v0.9.2;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772;4:SmoothProgressBar@v0.3.2;5:HoloAccent@v0.9;6:MenuComponent@ee3d4ac2e2
+    prebuild=rm -rf dist/ art/ && \
+        cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+        cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/ && \
+        cp libs/android-support-v4.jar $$HoloAccent$$/libs/ && \
+        mkdir $$MenuComponent$$/libs/ && cp libs/android-support-v4.jar $$MenuComponent$$/libs/
+
+Maintainer Notes:
+Tags are for the 'dev' branch, not the 'fdroid' branch that we want to use.
+.
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.2.9.1
-Current Version Code:78
+Current Version:0.2.9.9
+Current Version Code:91
 
diff --git a/metadata/org.mariotaku.twidere/GooglePlay.patch b/metadata/org.mariotaku.twidere/GooglePlay.patch
new file mode 100644
index 0000000000..c62a06fb0b
--- /dev/null
+++ b/metadata/org.mariotaku.twidere/GooglePlay.patch
@@ -0,0 +1,43 @@
+diff --git a/project.properties b/project.properties
+index 79a96c4..910deaf 100644
+--- a/project.properties
++++ b/project.properties
+@@ -13,4 +13,3 @@ target=android-19
+ android.library.reference.1=../ActionBar-PullToRefresh
+ android.library.reference.2=../drag-sort-listview
+ android.library.reference.3=../SlidingMenu
+-android.library.reference.4=../google-play-services_lib
+diff --git a/src/org/mariotaku/twidere/activity/MapViewerActivity.java b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
+index 23e9fc7..d8d5a3f 100644
+--- a/src/org/mariotaku/twidere/activity/MapViewerActivity.java
++++ b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
+@@ -26,13 +26,9 @@ import android.support.v4.app.FragmentTransaction;
+ import android.view.Menu;
+ import android.view.MenuItem;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GooglePlayServicesUtil;
+-
+ import org.mariotaku.twidere.Constants;
+ import org.mariotaku.twidere.R;
+ import org.mariotaku.twidere.activity.support.TwidereSwipeBackActivity;
+-import org.mariotaku.twidere.fragment.support.NativeMapFragment;
+ import org.mariotaku.twidere.fragment.support.WebMapFragment;
+ import org.mariotaku.twidere.util.MapInterface;
+ import org.mariotaku.twidere.util.ThemeUtils;
+@@ -92,13 +88,13 @@ public class MapViewerActivity extends TwidereSwipeBackActivity implements Const
+ 			finish();
+ 			return;
+ 		}
+-		final Fragment fragment = isNativeMapSupported() ? new NativeMapFragment() : new WebMapFragment();
++		final Fragment fragment = new WebMapFragment();
+ 		fragment.setArguments(bundle);
+ 		final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+ 		ft.replace(android.R.id.content, fragment).commit();
+ 	}
+ 
+ 	private boolean isNativeMapSupported() {
+-		return GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS;
++		return false;
+ 	}
+ }
diff --git a/metadata/org.martus.android.txt b/metadata/org.martus.android.txt
new file mode 100644
index 0000000000..661b3d4b4b
--- /dev/null
+++ b/metadata/org.martus.android.txt
@@ -0,0 +1,26 @@
+Disabled:Lots of jars
+Categories:None
+License:GPLv3
+Web Site:http://code.google.com/p/martus
+Source Code:http://code.google.com/p/martus/source
+Issue Tracker:http://code.google.com/p/martus/issues
+
+Auto Name:Martus
+Summary:
+Description:
+...
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/martus.martus-android/
+
+Build:4.4,4
+    commit=PlayStoreVersion4
+    subdir=martus-android
+    forceversion=yes
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2013.10.29 - 4.4
+Current Version Code:4
+
diff --git a/metadata/org.me.tvhguide.txt b/metadata/org.me.tvhguide.txt
index a18271e48d..06f3122fb2 100644
--- a/metadata/org.me.tvhguide.txt
+++ b/metadata/org.me.tvhguide.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/john-tornblom/TVHGuide
 Source Code:https://github.com/john-tornblom/TVHGuide
diff --git a/metadata/org.mixare.txt b/metadata/org.mixare.txt
index e7b4fb9ad9..589cceb12c 100644
--- a/metadata/org.mixare.txt
+++ b/metadata/org.mixare.txt
@@ -1,10 +1,10 @@
 #NonFreeDep can be removed with the Manifest patch below, but the OSM still may not work
 AntiFeatures:NonFreeDep
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://www.mixare.org/
 Source Code:http://github.com/danielegobbetti/mixare
-Issue Tracker:http://code.google.com/p/mixare/issues/list
+Issue Tracker:http://code.google.com/p/mixare/issues
 
 Auto Name:Mixare
 Summary:Augmented reality browser
@@ -40,8 +40,7 @@ Auto Update Mode:None
 #Build Version:0.9.2,26,6450ce9af6,init=rm plugins/mixare-library/build.xml,\
 #update=.;plugins/mixare-library,prebuild=\
 #sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.9.2
 Current Version Code:26
 
diff --git a/metadata/org.montrealtransit.android.schedule.stmbus.txt b/metadata/org.montrealtransit.android.schedule.stmbus.txt
new file mode 100644
index 0000000000..15b34254b2
--- /dev/null
+++ b/metadata/org.montrealtransit.android.schedule.stmbus.txt
@@ -0,0 +1,21 @@
+Category:Navigation
+License:Apache2
+Web Site:
+Source Code:https://code.google.com/p/montrealtransit-for-android/source
+Issue Tracker:https://code.google.com/p/montrealtransit-for-android/issues
+Donate:https://code.google.com/p/montrealtransit-for-android
+
+Summary:Addon for Montréal Transit
+Description:
+Allows you to store data offline for [[org.montrealtransit.android]].
+.
+
+Repo Type:git-svn
+Repo:http://montrealtransit-for-android.googlecode.com/svn/trunk/MonTransit-Schedule-STM-Bus
+
+Build Version:1.0.2,3,887,rm=custom_rules.xml
+
+Update Check Mode:None
+Current Version:1.0.2
+Current Version Code:3
+
diff --git a/metadata/org.montrealtransit.android.txt b/metadata/org.montrealtransit.android.txt
new file mode 100644
index 0000000000..4d9645245f
--- /dev/null
+++ b/metadata/org.montrealtransit.android.txt
@@ -0,0 +1,26 @@
+AntiFeatures:UpstreamNonFree
+Category:Navigation
+License:Apache2
+Web Site:
+Source Code:https://code.google.com/p/montrealtransit-for-android/source
+Issue Tracker:https://code.google.com/p/montrealtransit-for-android/issues
+Donate:https://code.google.com/p/montrealtransit-for-android
+
+Summary:Public transit for Canada
+Description:
+Several proprietary libraries were removed
+.
+
+Repo Type:git-svn
+Repo:http://montrealtransit-for-android.googlecode.com/svn/trunk/MonTransit
+
+Build Version:1.7.7.4,886,886,\
+rm=custom_rules.xml;libs/libGoogleAnalytics.jar;libs/admob-sdk-android.jar,\
+srclibs=1:ViewPagerIndicator@2.4.1;NoAnalytics@a63142b59e740;MobAdMob@2d5736,\
+prebuild=\
+  echo 'source.dir=src;$$MobAdMob$$/src;$$NoAnalytics$$/src' > ant.properties 
+
+Update Check Mode:None
+Current Version:1.7.7.5
+Current Version Code:887
+
diff --git a/metadata/org.moparisthebest.appbak.txt b/metadata/org.moparisthebest.appbak.txt
index 5419d526ec..75e643ba2e 100644
--- a/metadata/org.moparisthebest.appbak.txt
+++ b/metadata/org.moparisthebest.appbak.txt
@@ -1,5 +1,5 @@
 Disabled:Source not in any repo
-Category:System
+Categories:System
 License:GPL
 Web Site:http://android.moparisthebest.org/index.php/apps/appbak
 Source Code:http://android.moparisthebest.org/
diff --git a/metadata/org.mosspaper.txt b/metadata/org.mosspaper.txt
index d5432c5a18..a7cc441705 100644
--- a/metadata/org.mosspaper.txt
+++ b/metadata/org.mosspaper.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Apache2
 Web Site:http://teneighty.github.com/moss/samples.html
 Source Code:https://github.com/teneighty/moss
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index dfbdfa1fd1..c35bc3a674 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -1,5 +1,5 @@
 AntiFeatures:NonFreeAdd,Tracking
-Category:Internet
+Categories:Internet
 #mostly...
 License:MPL2
 Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
@@ -28,13 +28,19 @@ Tracking: Stats are sent back regularly to the developers, but that can
 be disabled via settings.
 .
 
-#Binaries in repo for now, build process is large and complex. They are very
-#well hidden - Mozilla appear very keen to force use of the proprietary market.
-#They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/
+Maintainer Notes:
+Binaries in repo for now, build process is large and complex. The binaries are
+very well hidden - Mozilla appear very keen to force use of the proprietary market.
+They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/
+
+The HTTP update check no longer works because they stopped putting any useful
+info alongside the binaries.
+.
+
 Auto Update Mode:None
 #Device-variable in Market
 Update Check Mode:HTTP
 Update Check Data:http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android/multi/android_info.txt|buildID=(\d{10})\d{4}|http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android/multi/|fennec-([\d.]+)\.multi\.android-arm\.apk
-Current Version:24.0
-Current Version Code:2013091112
+Current Version:26.0
+Current Version Code:2013120507
 
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
deleted file mode 100644
index d13815173f..0000000000
--- a/metadata/org.mozilla.firefox_beta.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Disabled:We'll just have org.mozilla.firefox
-Category:Internet
-#mostly...
-License:MPL2
-Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements
-Source Code:http://hg.mozilla.org/
-Issue Tracker:https://bugzilla.mozilla.org
-
-Summary:Next version of the web browser
-Description:
-Mobile version of the Mozilla Firefox web browser. Uses the Gecko layout engine to render web pages,
-which implements current and anticipated web standards. Features include bookmark sync and custom search
-engines.
-
-N.B each version has several betas but only one of them is here. See the website for a link to the
-ftp site to get the latest, and a list of compatible devices. This version is for ARMv7 architectures
-only but the ftp server has versions that work on the more powerful ARMv6 devices.
-.
-
-Update Check Mode:Static
-
diff --git a/metadata/org.mozilla.mozstumbler.txt b/metadata/org.mozilla.mozstumbler.txt
new file mode 100644
index 0000000000..7d2c14b179
--- /dev/null
+++ b/metadata/org.mozilla.mozstumbler.txt
@@ -0,0 +1,37 @@
+Categories:Navigation
+License:MPL2
+Web Site:https://location.services.mozilla.com
+Source Code:https://github.com/mozilla/MozStumbler.git
+Issue Tracker:https://github.com/mozilla/MozStumbler/issues
+
+Auto Name:MozStumbler
+Summary:Data gathering for Mozilla Location Service
+Description:
+Android Stumbler for Mozilla Location Service.  This allows you
+to contribute a mapping from Cell towers and WiFi access points
+to a GPS location. This will be used for location services when
+no GPS is available, similar to OpenWLANMap.
+.
+
+Repo Type:git
+Repo:https://github.com/mozilla/MozStumbler.git
+
+Build:0.8.2,20
+    commit=32d4102
+    gradle=yes
+    prebuild=sed -i -e 's/debuggable true/debuggable false/' -e '/task wrapper/,/^}$/d' build.gradle
+
+Build:0.8.3,21
+    commit=v0.8.3
+    gradle=yes
+    prebuild=sed -i -e 's/debuggable true/debuggable false/' build.gradle
+
+Maintainer Notes:
+We'll put it back to UCM:Tags once we support AndroidManifest.xml.in
+.
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.8.3
+Current Version Code:21
+
diff --git a/metadata/org.mrpdaemon.android.encdroid.txt b/metadata/org.mrpdaemon.android.encdroid.txt
index 82c261f409..9c4d03fdd3 100644
--- a/metadata/org.mrpdaemon.android.encdroid.txt
+++ b/metadata/org.mrpdaemon.android.encdroid.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/mrpdaemon/encdroid
 Source Code:https://github.com/mrpdaemon/encdroid
-Issue Tracker:https://github.com/mrpdaemon/encdroid.git
+Issue Tracker:https://github.com/mrpdaemon/encdroid/issues
 
 Auto Name:Encdroid
 Summary:Access encrypted files
@@ -13,14 +13,17 @@ No description available
 Repo Type:git
 Repo:https://github.com/mrpdaemon/encdroid.git
 
-Build Version:1.0,1,!only publish when provider that doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0,\
-target=android-13,srclibs=EncfsJava@v0.1,extlibs=\
-dropbox-sdk/dropbox-android-sdk-1.5.1.jar;httpmime/httpmime-4.0.3.jar;json-simple/json_simple-1.1.jar,\
-prebuild=mvn package -f $$EncfsJava$$/pom.xml && cp $$EncfsJava$$/target/encfs-java-0.1.jar libs/
+Build:1.0,1
+    disable=only publish when provider that doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0
+    commit=doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0
+    target=android-13
+    extlibs=dropbox-sdk/dropbox-android-sdk-1.5.1.jar;httpmime/httpmime-4.0.3.jar;json-simple/json_simple-1.1.jar
+    srclibs=EncfsJava@v0.1
+    prebuild=mvn package -f $$EncfsJava$$/pom.xml && \
+        cp $$EncfsJava$$/target/encfs-java-0.1.jar libs/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.6
-Current Version Code:10
+Update Check Mode:Tags
+Current Version:2.0.3
+Current Version Code:1400203
 
diff --git a/metadata/org.mult.daap.txt b/metadata/org.mult.daap.txt
index 248d296133..c7baca3e8d 100644
--- a/metadata/org.mult.daap.txt
+++ b/metadata/org.mult.daap.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2+
 Web Site:http://code.google.com/p/daap-client/
-Source Code:http://code.google.com/p/daap-client/source/checkout
-Issue Tracker:http://code.google.com/p/daap-client/issues/list
+Source Code:http://code.google.com/p/daap-client/source
+Issue Tracker:http://code.google.com/p/daap-client/issues
 
 Auto Name:DAAP
 Summary:DAAP (Music/media sharing) Client
@@ -11,7 +11,7 @@ Client for DAAP (Digital Audio Access Protocol) servers. Supports streaming,
 queuing, playlists, and searching.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://daap-client.googlecode.com/svn/trunk
 
 Build Version:.9.1,30,62
@@ -24,7 +24,6 @@ Build Version:.9.7+,45,107,forceversion=yes,target=android-8
 Build Version:.9.7++,46,108,forceversion=yes,forcevercode=yes,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:.9.7
 Current Version Code:46
diff --git a/metadata/org.mumod.android.txt b/metadata/org.mumod.android.txt
index b64da84cb0..9e3a25fa11 100644
--- a/metadata/org.mumod.android.txt
+++ b/metadata/org.mumod.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://mumod.kromonos.net
 Source Code:https://github.com/kromonos/Mustard-Mod
diff --git a/metadata/org.musicbrainz.picard.barcodescanner.txt b/metadata/org.musicbrainz.picard.barcodescanner.txt
index c5c00e2aa5..de830214bf 100644
--- a/metadata/org.musicbrainz.picard.barcodescanner.txt
+++ b/metadata/org.musicbrainz.picard.barcodescanner.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/phw/PicardBarcodeScanner
diff --git a/metadata/org.mustard.android.txt b/metadata/org.mustard.android.txt
index d3a985ce65..6078b58075 100644
--- a/metadata/org.mustard.android.txt
+++ b/metadata/org.mustard.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://mustard.macno.org
 Source Code:http://gitorious.org/~macno/mustard/macnos-clone/
@@ -10,15 +10,15 @@ Auto Name:Mustard
 Summary:Microblogging via StatusNet
 Description:
 '''The versions here don't work with Twitter or identi.ca any more'''. 
-They only work with StatusNet. 
+They only work with GNU Social (formerly StatusNet).
 You may like to try [[org.mariotaku.twidere]] or [[org.andstatus.app]], 
 for Twitter; or [[org.macno.puma]] for identi.ca.
 
-Mustard is a full-featured client for [http://status.net Statusnet]
-(now called GNU Social), a microblogging platform somewhat like Twitter, 
-but decentralized.
-Note that the hitherto largest Statusnet site, [http://identi.ca identi.ca], 
-now uses a different platform called [http://pump.io pump.io]. 
+Mustard is a full-featured client for [http://status.net Statusnet] /
+GNU Social, a microblogging platform somewhat like Twitter, but
+decentralized.
+Note that the hitherto largest Statusnet site, [http://identi.ca identi.ca],
+now uses a different platform called [http://pump.io pump.io].
 
 It has many features like attachments, geolocation and avatar update.
 It supports tags, groups and public timelines, favor/disfavor notices,
@@ -28,8 +28,12 @@ If the server uses OAuth the credentials will need to be put
 on a server as explained on the website.
 .
 
-#Repo Type:git
-#Repo:git://gitorious.org/~macno/mustard/macnos-clone.git
+Repo Type:git
+Repo:git://gitorious.org/~macno/mustard/macnos-clone.git
+
+Build Version:0.4.1,150,315d7ef,\
+prebuild=sed -i '3d;6d' res/values/keys-example.xml && \
+mv res/values/keys-example.xml res/values/keys.xml
 
 # This build seems to break oAuth for Statusnet; see Mumod for guidance
 #Build Version:0.3.5b,140,2ce38a6,prebuild=\
diff --git a/metadata/org.mythdroid.txt b/metadata/org.mythdroid.txt
index 9d82805f7e..0dc56055d7 100644
--- a/metadata/org.mythdroid.txt
+++ b/metadata/org.mythdroid.txt
@@ -1,34 +1,34 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/mythdroid/
-Source Code:http://code.google.com/p/mythdroid/source/checkout
-Issue Tracker:http://code.google.com/p/mythdroid/issues/list
+Source Code:http://code.google.com/p/mythdroid/source
+Issue Tracker:http://code.google.com/p/mythdroid/issues
 
 Auto Name:MythDroid
 Summary:MythTV remote control system
 Description:
 A remote control system for MythTV featuring:
-*Support MythTV 0.21 - 0.26
-*Optimised for both phone and tablet screens
-*Coverart / fanart display (MythTV 0.25+)
-*Standard and 'gesture' remote control interfaces
-*Move in-progress playback between frontends and/or the device itself
-*Wake and unlock upon device movement whilst in remotes
-*Display of detected commercial breaks
-*Browse, schedule, delete and play recordings
-*Stream recordings and videos to the android device
-*Music remote with album art
-*Video browsing and playback
-*Status and Program guide viewers
-*Automatic discovery of frontends and backend
-*Supports multiple frontends
-*Hardware keyboard 'passthru'
-*Frontend Wake On Lan
-*Call / SMS info display on MythTV OSD
-*Automated, secure, muxed connection for simplified use when away from home
+* Support MythTV 0.21 - 0.26
+* Optimised for both phone and tablet screens
+* Coverart / fanart display (MythTV 0.25+)
+* Standard and 'gesture' remote control interfaces
+* Move in-progress playback between frontends and/or the device itself
+* Wake and unlock upon device movement whilst in remotes
+* Display of detected commercial breaks
+* Browse, schedule, delete and play recordings
+* Stream recordings and videos to the android device
+* Music remote with album art
+* Video browsing and playback
+* Status and Program guide viewers
+* Automatic discovery of frontends and backend
+* Supports multiple frontends
+* Hardware keyboard 'passthru'
+* Frontend Wake On Lan
+* Call / SMS info display on MythTV OSD
+* Automated, secure, muxed connection for simplified use when away from home
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://mythdroid.googlecode.com/svn/trunk/
 
 Build Version:0.4.3,4,244,prebuild=mv lib libs
diff --git a/metadata/org.n52.sosmobileclient.txt b/metadata/org.n52.sosmobileclient.txt
new file mode 100644
index 0000000000..6b1b70cb43
--- /dev/null
+++ b/metadata/org.n52.sosmobileclient.txt
@@ -0,0 +1,28 @@
+Categories:Science & Education
+License:MIT
+Web Site:http://52north.org
+Source Code:https://github.com/marfnk/sosmobileclient
+Issue Tracker:https://github.com/marfnk/sosmobileclient/issues
+
+Auto Name:MobileSWC
+Summary:Watch sensors in Europe
+Description:
+HTML5 client for the Sensor Observation Network by 52north.
+Most sensors are in Germany and Belgium though there are 
+some in Asia.
+
+Status: Beta.
+.
+
+Repo Type:git
+Repo:https://github.com/marfnk/sosmobileclient.git
+
+Build:1.0.0,12
+    commit=f0609f17a677e
+    forceversion=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.0 beta (bugfix1)
+Current Version Code:12
+
diff --git a/metadata/org.nathan.jf.build.prop.editor.txt b/metadata/org.nathan.jf.build.prop.editor.txt
index 441231d6a0..73ab29eaef 100644
--- a/metadata/org.nathan.jf.build.prop.editor.txt
+++ b/metadata/org.nathan.jf.build.prop.editor.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/nathanpc/Build.prop-Editor
 Source Code:https://github.com/nathanpc/Build.prop-Editor
@@ -13,9 +13,8 @@ editing an entry you must press a button in the top right hand corner
 that isn't very visible and changes may not register in the list until
 you re-enter the app.
 
-Don't
-mess with this unless you know what you are doing and are confident
-that you can restore a backup via adb shell in recovery.
+Don't mess with this unless you know what you are doing and are confident that
+you can restore a backup via adb shell in recovery.
 
 Requires root: Yes. The build.prop is located in /system.
 .
@@ -26,11 +25,10 @@ Repo Type:git
 Repo:https://github.com/nathanpc/Build.prop-Editor.git
 
 Build Version:2.0.0,3,581902,target=android-14
-Build Version:2.0.1,4,b3dd61f8,init=rm -rf bin gen
+Build Version:2.0.1,4,b3dd61f8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.1
 Current Version Code:4
 
diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 12a8ce530b..f179b57bc5 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -1,11 +1,10 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv2
 Web Site:http://www.navit-project.org
 Source Code:http://sourceforge.net/p/navit/code
 Issue Tracker:http://trac.navit-project.org/
 
 Name:Navit
-Auto Name:
 Summary:Car navigation system
 Description:
 Its modular design is capable of using vector maps of various formats
@@ -21,23 +20,37 @@ You can help translating via the web-based
 .
 
 #http://wiki.navit-project.org/index.php/Android_development
-Repo Type:svn
+Repo Type:git-svn
 Repo:svn://svn.code.sf.net/p/navit/code/trunk
 
-Build Version:5650,5650,5650,\
-novcheck=yes,\
-update=no,\
-build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
-      mkdir android-build && \
-      cd android-build/ && \
-      cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
-      make && \
-      make android_resources && \
-      cd .. && \
-      ln -s android-build/navit/android/* . 
+Build:5650,5650
+    commit=5650
+    update=no
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        mkdir android-build && \
+        cd android-build/ && \
+        cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
+        make && \
+        make android_resources && \
+        cd .. && \
+        ln -s android-build/navit/android/* . 
+    novcheck=yes
+
+Build:5720,5720
+    commit=5720
+    update=no
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        mkdir android-build && \
+        cd android-build/ && \
+        cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
+        make && \
+        make android_resources && \
+        cd .. && \
+        ln -s android-build/navit/android/* . 
+    novcheck=yes
 
 Auto Update Mode:None
 Update Check Mode:RepoTrunk
-Current Version:5655
-Current Version Code:5655
+Current Version:5740
+Current Version Code:5740
 
diff --git a/metadata/org.ncrmnt.nettts.txt b/metadata/org.ncrmnt.nettts.txt
index 38fa520b58..937f703385 100644
--- a/metadata/org.ncrmnt.nettts.txt
+++ b/metadata/org.ncrmnt.nettts.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://github.com/nekromant/NetTTS
 Source Code:https://github.com/nekromant/NetTTS
diff --git a/metadata/org.nerdcircus.android.klaxon.txt b/metadata/org.nerdcircus.android.klaxon.txt
index dcf7fae206..e100c73cff 100644
--- a/metadata/org.nerdcircus.android.klaxon.txt
+++ b/metadata/org.nerdcircus.android.klaxon.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:http://code.google.com/p/klaxon/
-Source Code:http://code.google.com/p/klaxon/source/checkout
-Issue Tracker:http://code.google.com/p/klaxon/issues/list
+Source Code:http://code.google.com/p/klaxon/source
+Issue Tracker:http://code.google.com/p/klaxon/issues
 
 Name:Klaxon
 Auto Name:Klaxon
@@ -19,8 +19,7 @@ Repo:http://klaxon.googlecode.com/svn/trunk/
 Build Version:0.27,27,144,target=android-14
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.27
 Current Version Code:27
 
diff --git a/metadata/org.nick.wwwjdic.txt b/metadata/org.nick.wwwjdic.txt
index ab4b6f91f6..53b154e808 100644
--- a/metadata/org.nick.wwwjdic.txt
+++ b/metadata/org.nick.wwwjdic.txt
@@ -1,9 +1,10 @@
-AntiFeatures:Tracking
-Category:Science & Education
+AntiFeatures:Tracking,UpstreamNonFree
+Categories:Science & Education
 License:Apache2
 Web Site:https://code.google.com/p/wwwjdic/
-Source Code:https://code.google.com/p/wwwjdic/source/list
-Issue Tracker:https://code.google.com/p/wwwjdic/issues/list
+Source Code:https://code.google.com/p/wwwjdic/source
+Issue Tracker:https://code.google.com/p/wwwjdic/issues
+Bitcoin:1DXhWFS9SL78GGyX7Luao9EuP5SxtDiPG1
 
 Auto Name:WWWJDIC for Android
 Summary:Japanese online dictionary
@@ -29,33 +30,79 @@ to use all features.
 * Optical Character Recognition (WeOCR; author's server)
 * OCR-based handwritten kanji recognition, does not require correct stroke order
 
-Flurry analytics library was removed before building. Thus the analytics switch
-in the preferences isn't relevant. Anti-feature: Tracking. Crash
-reports are sent by default, thought that can be disabled.
+A proprietary analytics library was removed before building, so the analytics
+switch in the preferences isn't relevant. Anti-feature: Tracking. Crash
+reports are sent by default, though that can be disabled.
 .
 
-#the trunk is old; leave as svn because it'll likely change
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://wwwjdic.googlecode.com/svn/branches/2.0/
 
-Build Version:2.2.5,2250,995,subdir=wwwjdic-app,encoding=utf-8,target=android-15,\
-update=.;../wwwjdic,srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1,\
-extlibs=android/android-support-v4.jar,prebuild=\
-wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
-touch assets/keys && mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
-echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties
-Build Version:2.3.2,2320,!doesn't build at 1062,subdir=wwwjdic-app,encoding=utf-8,target=android-15,\
-update=.;../wwwjdic,srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1,\
-extlibs=android/android-support-v4.jar,prebuild=\
-wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
-touch assets/keys && mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
-echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties
+Build:2.2.5,2250
+    commit=995
+    subdir=wwwjdic-app
+    target=android-15
+    update=.;../wwwjdic
+    encoding=utf-8
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1
+    prebuild=wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
+        touch assets/keys && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
+        echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties
+
+Build:2.3.2,2320
+    disable=doesn't build at 1062
+    commit=1062
+    subdir=wwwjdic-app
+    target=android-15
+    update=.;../wwwjdic
+    encoding=utf-8
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1
+    prebuild=wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
+        touch assets/keys && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
+        echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties
+
+Build:2.3.3,2330
+    commit=1071
+    subdir=wwwjdic-app
+    target=android-18
+    update=.;../wwwjdic
+    encoding=utf-8
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1
+    prebuild=wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
+        touch assets/keys && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
+        echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties && \
+        mkdir src
+
+Build:2.3.4,2341
+    commit=1080
+    subdir=wwwjdic-app
+    target=android-19
+    update=.;../wwwjdic
+    encoding=utf-8
+    extlibs=android/android-support-v4.jar
+    srclibs=ActionBarSherlock@4.2.0;FinfAgent@v0.1
+    prebuild=wget http://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
+        touch assets/keys && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
+        echo "android.library.reference.2=$$FinfAgent$$" >> ../wwwjdic/project.properties && \
+        mkdir src
+
+Maintainer Notes:
+Note that all development is in branches/2.0, not trunk.
+.
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.3.2
-Current Version Code:2320
+Update Check Mode:RepoManifest
+Current Version:2.3.4
+Current Version Code:2341
 
diff --git a/metadata/org.npr.android.news.txt b/metadata/org.npr.android.news.txt
index 5a16c87458..ff2986a4f8 100644
--- a/metadata/org.npr.android.news.txt
+++ b/metadata/org.npr.android.news.txt
@@ -1,8 +1,9 @@
-Category:Reading
+AntiFeatures:UpstreamNonFree
+Categories:Reading
 License:Apache2
 Web Site:https://code.google.com/p/npr-android-app/ 
-Source Code:https://code.google.com/p/npr-android-app/source/browse/
-Issue Tracker:https://code.google.com/p/npr-android-app/issues/list
+Source Code:https://code.google.com/p/npr-android-app/source
+Issue Tracker:https://code.google.com/p/npr-android-app/issues
 
 Auto Name:NPR News
 Summary:Radio player & News
diff --git a/metadata/org.ntpsync.txt b/metadata/org.ntpsync.txt
index 601cd993fe..18229594eb 100644
--- a/metadata/org.ntpsync.txt
+++ b/metadata/org.ntpsync.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/android-apps/#ntpsync
 Source Code:https://github.com/dschuermann/ntp-sync
diff --git a/metadata/org.odk.collect.android.txt b/metadata/org.odk.collect.android.txt
index 620c28f081..600591a207 100644
--- a/metadata/org.odk.collect.android.txt
+++ b/metadata/org.odk.collect.android.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:Apache2
 Web Site:http://opendatakit.org
-Source Code:http://code.google.com/p/opendatakit/source/checkout?repo=collect
-Issue Tracker:http://code.google.com/p/opendatakit/issues/list
+Source Code:http://code.google.com/p/opendatakit/source
+Issue Tracker:http://code.google.com/p/opendatakit/issues
 
 Auto Name:ODK Collect
 Summary:Data collection tools
@@ -28,19 +28,34 @@ Repo Type:hg
 Repo:https://code.google.com/p/opendatakit.collect/
 
 #No API-8 on the build server
-Build Version:1.2.1,1015,6b017ddf90f2,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10
-Build Version:1.2.1+,1020,v1.2.1 rev 1020,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10,forceversion=yes
-Build Version:1.2.2,1023,v1.2.2 rev 1023,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10
-Build Version:1.4,1033,!GMS at v1.4 rev 1033
+Build:1.2.1,1015
+    commit=6b017ddf90f2
+    target=Google Inc.:Google APIs:10
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.2.1+,1020
+    commit=v1.2.1 rev 1020
+    target=Google Inc.:Google APIs:10
+    forceversion=yes
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.2.2,1023
+    commit=v1.2.2 rev 1023
+    target=Google Inc.:Google APIs:10
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.4,1038
+    disable=Google Play Services
+    commit=v1.4 rev 1033
 
 Auto Update Mode:None
-#Device Variable: check downloads section instead
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.4
-Current Version Code:1033
+Current Version Code:1038
 
 # gplay services
 No Source Since:1.4
+
diff --git a/metadata/org.okfn.pod.txt b/metadata/org.okfn.pod.txt
new file mode 100644
index 0000000000..d6965eaffe
--- /dev/null
+++ b/metadata/org.okfn.pod.txt
@@ -0,0 +1,23 @@
+Categories:Office
+License:MIT
+Web Site:http://okfn.org
+Source Code:https://github.com/okfn/product-browser-android
+Issue Tracker:https://github.com/okfn/product-browser-android/issues
+
+Auto Name:Product Open Data
+Summary:Get product info from barcodes
+Description:
+No description available
+.
+
+Repo Type:git
+Repo:https://github.com/okfn/product-browser-android.git
+
+Build:1.00.13,13
+    commit=506cfbed0072a8
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.00.13
+Current Version Code:13
+
diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index f8dba2a3eb..2a641dd647 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:AGPLv3
 Web Site:http://openbmap.org
-Source Code:https://code.google.com/p/openbmap
-Issue Tracker:http://code.google.com/p/openbmap/issues/list
+Source Code:https://code.google.com/p/openbmap/source
+Issue Tracker:http://code.google.com/p/openbmap/issues
 
 Auto Name:Radiobeacon
 Summary:Contribute to coverage maps
@@ -23,17 +23,36 @@ Status: Testing
 Repo Type:git
 Repo:https://code.google.com/p/openbmap
 
-Build Version:1.0,1,!wrongly versioned (was fe1f5fe76b)
-Build Version:0.7.1,2,858b0d926c14,subdir=android,\
-init=rm -rf bin/ && sed -i '/proguard/d' project.properties,\
-srclibs=Mapsforge@0f71a427bd50,\
-build=$$MVN3$$ clean package -DskipTests -f $$Mapsforge$$/pom.xml && \
-      mv $$Mapsforge$$/mapsforge-map/target/\
-mapsforge-map-0.3.1-SNAPSHOT-jar-with-dependencies.jar libs/
-Build Version:0.7.6,5,v0.7.6,subdir=android,prebuild=sed -i '/proguard/d' project.properties
+Build:1.0,1
+    disable=wrongly versioned (was fe1f5fe76b)
+    commit=unknown - see disabled
 
-Auto Update Mode:None
+Build:0.7.1,2
+    commit=858b0d926c14
+    subdir=android
+    init=rm -rf bin/ && \
+        sed -i '/proguard/d' project.properties
+    srclibs=Mapsforge@0f71a427bd50
+    build=$$MVN3$$ clean package -DskipTests -f $$Mapsforge$$/pom.xml && \
+        mv $$Mapsforge$$/mapsforge-map/target/mapsforge-map-0.3.1-SNAPSHOT-jar-with-dependencies.jar libs/
+
+Build:0.7.6,5
+    commit=v0.7.6
+    subdir=android
+    prebuild=sed -i '/proguard/d' project.properties
+
+Build:0.7.7,6
+    commit=v0.7.7
+    subdir=android
+    prebuild=sed -i '/proguard/d' project.properties
+
+Build:0.7.7,7
+    commit=v0.7.7
+    subdir=android
+    prebuild=sed -i '/proguard/d' project.properties
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:0.7.6
-Current Version Code:5
+Current Version:0.7.7
+Current Version Code:7
 
diff --git a/metadata/org.opengpx.txt b/metadata/org.opengpx.txt
index ba09523757..12c4e341a8 100644
--- a/metadata/org.opengpx.txt
+++ b/metadata/org.opengpx.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:MIT
 Web Site:https://code.google.com/p/opengpx/
-Source Code:https://code.google.com/p/opengpx/source/list
-Issue Tracker:https://code.google.com/p/opengpx/issues/list
+Source Code:https://code.google.com/p/opengpx/source
+Issue Tracker:https://code.google.com/p/opengpx/issues
 
 Auto Name:OpenGPX
 Summary:Paperless geocaching
diff --git a/metadata/org.openintents.about.txt b/metadata/org.openintents.about.txt
index 173e74f825..12add50de5 100644
--- a/metadata/org.openintents.about.txt
+++ b/metadata/org.openintents.about.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/openintents/aboutapp
 Source Code:https://github.com/openintents/aboutapp
@@ -19,8 +19,7 @@ $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary
 rm -rf ../promotion ../icons ../AboutAppDemo default.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:8
 
diff --git a/metadata/org.openintents.filemanager.txt b/metadata/org.openintents.filemanager.txt
index 8c3d3abd25..4d205f3f21 100644
--- a/metadata/org.openintents.filemanager.txt
+++ b/metadata/org.openintents.filemanager.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://www.openintents.org
 Source Code:https://github.com/openintents/filemanager
-Issue Tracker:http://code.google.com/p/openintents/issues/list
+Issue Tracker:http://code.google.com/p/openintents/issues
 Donate:http://www.openintents.org/en/contribute
 
 Auto Name:OI File Manager
@@ -21,29 +21,63 @@ you will not be able to upgrade it without first manually removing (as root) the
 Repo Type:git
 Repo:https://github.com/openintents/filemanager.git
 
-Build Version:1.2-rc1,18,4106,subdir=FileManager,target=android-11,buildjni=yes,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
-Build Version:1.2,20,4170,subdir=FileManager,target=android-11,buildjni=yes,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
-#new repo
-Build Version:1.3,21,4358c17a,subdir=FileManager,target=android-14,buildjni=yes,srclibs=OI@4170,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-$$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
-Build Version:2.0.2,26,328b40775,subdir=FileManager,\
-target=android-14,buildjni=yes,srclibs=OI@4170,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-$$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+Build:1.2-rc1,18
+    commit=4106
+    subdir=FileManager
+    target=android-11
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
+        android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
+    buildjni=yes
 
-Build Version:2.0.3-rc1,28,2bdf550298,subdir=FileManager,\
-target=android-16,\
-srclibs=OI@4170,\
-prebuild=sed -i 's@\(.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
-         $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
-         rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest,\
-buildjni=yes
+Build:1.2,20
+    commit=4170
+    subdir=FileManager
+    target=android-11
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
+        android update project -p $$OI$$/distribution/DistributionLibrary -t android-11
+    buildjni=yes
+
+#new repo
+Build:1.3,21
+    commit=4358c17a
+    subdir=FileManager
+    target=android-14
+    srclibs=OI@4170
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
+        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
+        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    buildjni=yes
+
+Build:2.0.2,26
+    commit=328b40775
+    subdir=FileManager
+    target=android-14
+    srclibs=OI@4170
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
+        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
+        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    buildjni=yes
+
+Build:2.0.3-rc1,28
+    commit=2bdf550298
+    subdir=FileManager
+    target=android-16
+    srclibs=OI@4170
+    prebuild=sed -i 's@\(.1=\).*@\1$$OI$$/distribution/DistributionLibrary@' project.properties && \
+        $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary -t android-11 && \
+        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
+    buildjni=yes
+
+Build:2.0.3,29
+    disable=not yet
+
+Maintainer Notes:
+2.0.3 is a 'preparing for next release commit' - doesn't appear to be a real
+release yet.
+.
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.0.3-rc1
-Current Version Code:28
+Current Version:2.0.3
+Current Version Code:29
 
diff --git a/metadata/org.openlp.android.txt b/metadata/org.openlp.android.txt
index 450d92cb1d..26d5d6c3b4 100644
--- a/metadata/org.openlp.android.txt
+++ b/metadata/org.openlp.android.txt
@@ -1,8 +1,10 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://openlp.org
 Source Code:https://code.launchpad.net/~openlp-android/openlp/trunk
+Issue Tracker:
 
+Auto Name:OpenLP
 Summary:Remote for presentations
 Description:
 Remote control for the OpenLP worship presentation software.
@@ -11,9 +13,17 @@ Remote control for the OpenLP worship presentation software.
 Repo Type:bzr
 Repo:lp:openlp/android
 
-Build Version:1.0,1,1.0
+Build:1.0,1
+    commit=1.0
 
-# Tags
+Build:1.1,7
+	disable=no tag yet
+    commit=51
+
+Auto Update Mode:None
+# Tag 0.5 has vercode 5, we can't use Tags yet
+#Update Check Mode:Tags
 Update Check Mode:None
 Current Version:1.0
 Current Version Code:1
+
diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt
index 07e45d99bb..9c09700033 100644
--- a/metadata/org.openmsx.android.openmsx.txt
+++ b/metadata/org.openmsx.android.openmsx.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2
 Web Site:http://www.openmsx.org
 Source Code:http://sourceforge.net/p/openmsx/openmsx/
@@ -28,15 +28,22 @@ of drivers and have good (virtual) hardware capabilities.
 Repo Type:srclib
 Repo:libsdl-android
 
-# setup_anddev.sh downloads TCL sources and builds them in one go
+# this looks so ugly because:
+# 1) setup_anddev.sh downloads TCL sources, unpacks and builds them in one go
+# 2) AndroidManifest.xml is only generated after TCL compilation
 Build Version:0.9.1-584,11527,openttd-1.2.3.25,update=no,srclibs=OpenMSX@728325a472,buildjni=no,\
-subdir=project,patch=tcl.patch,scanignore=libsdl-android/project/jni/tcl8.5/lib,\
-init=ln -s ../../OpenMSX openmsx && find . -name "*.so" -delete &&\
- sed -ri 's/ant debug|ant release/exit/' ../build.sh &&\
- export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml,\
-build=cd $$OpenMSX$$/build/android/openmsx &&\
- declare -rx VERSION_NAME=0.9.1-584 &&\
+subdir=project,patch=tcl.patch,scanignore=project/jni/tcl8.5,\
+init=\
+  ln -s ../../OpenMSX/ openmsx && \
+  sed -ri 's/ant debug|ant release/exit/' ../build.sh && \
+  find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \
+  rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter,\
+build=\
+  export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && \
+  sed 's/android-15/android-17/' -i setup_anddev.sh && ./setup_anddev.sh && \
+  cd ../../../ && sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
+  cd openmsx/build/android/openmsx && \
+  declare -rx VERSION_NAME=0.9.1-584 && \
  ./launch_anddev_build.sh
 
 Auto Update Mode:None
diff --git a/metadata/org.openttd.sdl.txt b/metadata/org.openttd.sdl.txt
new file mode 100644
index 0000000000..38f16c8832
--- /dev/null
+++ b/metadata/org.openttd.sdl.txt
@@ -0,0 +1,51 @@
+Categories:Games
+License:GPLv2+
+Web Site:http://openttd.org/
+Source Code:https://github.com/pelya/commandergenius
+Issue Tracker:https://github.com/pelya/commandergenius/issues
+
+Name:OpenTTD
+Summary:Railway emulator
+Description:
+OpenTTD is asimulation game based upon the popular Microprose game "Transport
+Tycoon Deluxe", written by Chris Sawyer. It attempts to mimic the original
+game as closely as possible while extending it with new features.
+.
+
+Repo Type:srclib
+Repo:libsdl-android
+
+# some libraries, such as libandroid.so can't be rebuilt from included sources;
+# others, such as python.so may be recompiled (probably, better from srclibs)
+Build:1.3.2.25,13225
+    commit=openttd-1.3.2.25
+    disable=Fails to clone source - Svndiff compressed data is invalid: Compression of svndiff data failed at /usr/share/perl5/Git/SVN/Ra.pm line 282
+    subdir=project
+    submodules=yes
+    init=ln -fs openttd jni/application/src && \
+        sed -ri 's/ant debug|ant release/exit 0/' ../build.sh && \
+        sed -ri 's/exit 0//' ../copyAssets.sh && \
+        find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
+        cd jni && \
+        rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter && \
+        cd ../.. && \
+        ./changeAppSettings.sh -a
+    target=android-17
+    srclibs=OpenTTD@1.3.2
+    prebuild=mkdir -p jni/application/openttd/openttd-1.3.2 && \
+        cp -R $$OpenTTD$$/* jni/application/openttd/openttd-1.3.2 && \
+        cd jni/application/openttd/ && \
+        patch -p 0 -d openttd-1.3.2 < openttd-trunk-android.patch && \
+        patch -p 0 -d openttd-1.3.2 < findversion.sh.patch
+    scanignore=project/jni/application/commandergenius/commandergenius/icotool
+    build=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
+        cd .. && \
+        ./build.sh release
+    buildjni=no
+
+# todo
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.3.2.25
+Current Version Code:13225
+
diff --git a/metadata/org.osmdroid.txt b/metadata/org.osmdroid.txt
index c733b85cf2..fc269734ac 100644
--- a/metadata/org.osmdroid.txt
+++ b/metadata/org.osmdroid.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:LGPL
 Web Site:http://code.google.com/p/osmdroid/
-Source Code:http://code.google.com/p/osmdroid/source/checkout
-Issue Tracker:http://code.google.com/p/osmdroid/issues/list
+Source Code:http://code.google.com/p/osmdroid/source
+Issue Tracker:http://code.google.com/p/osmdroid/issues
 
 Summary:OpenStreetMap map viewer
 Description:
diff --git a/metadata/org.passwordmaker.android.txt b/metadata/org.passwordmaker.android.txt
index 6001f8cdb3..482fea9661 100644
--- a/metadata/org.passwordmaker.android.txt
+++ b/metadata/org.passwordmaker.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://passwordmaker.tasermonkeys.com/android
 Source Code:https://github.com/tasermonkey/android-passwordmaker
diff --git a/metadata/org.paulmach.textedit.txt b/metadata/org.paulmach.textedit.txt
index b889613db3..0a2d68824e 100644
--- a/metadata/org.paulmach.textedit.txt
+++ b/metadata/org.paulmach.textedit.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://textedit.paulmach.com/
 Source Code:https://github.com/paulmach/Text-Edit-for-Android
@@ -22,8 +22,7 @@ Build Version:1.4.1,14,cddfa34997bf3da10586,target=android-8,patch=set1.4.1.patc
 Build Version:1.5,15,a46aec194ec385a0d543e80709821c16cf8aa198,target=android-8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:15
 
diff --git a/metadata/org.penghuang.tools.rotationlock.txt b/metadata/org.penghuang.tools.rotationlock.txt
index bfc76acb44..ebc8ce6439 100644
--- a/metadata/org.penghuang.tools.rotationlock.txt
+++ b/metadata/org.penghuang.tools.rotationlock.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:https://market.android.com/details?id=org.penghuang.tools.rotationlock
 Source Code:https://github.com/phuang/RotationLock
@@ -21,8 +21,7 @@ Build Version:1.5,6,08fce41fd3ce0e0686d5bded6841c21b9247c2e8,target=android-4,rm
 Build Version:1.6,7,6a7fef6f77e230d3c6ceda8b17771937f1588f41,rm=ant.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.6
 Current Version Code:7
 
diff --git a/metadata/org.peterbaldwin.client.android.tinyurl.txt b/metadata/org.peterbaldwin.client.android.tinyurl.txt
index 7a8786aa89..16e3364bcc 100644
--- a/metadata/org.peterbaldwin.client.android.tinyurl.txt
+++ b/metadata/org.peterbaldwin.client.android.tinyurl.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/android-tinyurl
-Source Code:http://code.google.com/p/android-tinyurl/source/list
-Issue Tracker:http://code.google.com/p/android-tinyurl/issues/list
+Source Code:http://code.google.com/p/android-tinyurl/source
+Issue Tracker:http://code.google.com/p/android-tinyurl/issues
 
 Auto Name:Link Shortener for TinyURL
 Summary:Shorten urls to tinyurl.com
@@ -18,8 +18,7 @@ Repo:http://android-tinyurl.googlecode.com/svn/trunk/
 Build Version:1.0.9,10,30,target=android-7,prebuild=rm -rf releases/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.9
 Current Version Code:10
 
diff --git a/metadata/org.peterbaldwin.client.android.vlcremote.txt b/metadata/org.peterbaldwin.client.android.vlcremote.txt
index 7b4d09891c..6d9a138897 100644
--- a/metadata/org.peterbaldwin.client.android.vlcremote.txt
+++ b/metadata/org.peterbaldwin.client.android.vlcremote.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/android-vlc-remote
-Source Code:http://code.google.com/p/android-vlc-remote/source/list
-Issue Tracker:http://code.google.com/p/android-vlc-remote/issues/list
+Source Code:http://code.google.com/p/android-vlc-remote/source
+Issue Tracker:http://code.google.com/p/android-vlc-remote/issues
 
 Auto Name:Remote for VLC
 Summary:Control VLC with your phone
diff --git a/metadata/org.petero.droidfish.txt b/metadata/org.petero.droidfish.txt
index ad16e19bae..7d332f8e0f 100644
--- a/metadata/org.petero.droidfish.txt
+++ b/metadata/org.petero.droidfish.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/cuckoochess/
-Source Code:http://code.google.com/p/cuckoochess/source/checkout
-Issue Tracker:http://code.google.com/p/cuckoochess/issues/list
+Source Code:http://code.google.com/p/cuckoochess/source
+Issue Tracker:http://code.google.com/p/cuckoochess/issues
 
 Auto Name:DroidFish
 Summary:Chess program
@@ -17,25 +17,62 @@ app by long-pressing the board and choosing Load game from Scid file.
 Repo Type:git-svn
 Repo:http://cuckoochess.googlecode.com/svn/trunk
 
-Build Version:1.44,51,963,subdir=DroidFish,buildjni=yes,target=android-10,\
-prebuild=cp -r ../CuckooChessEngine/src/* src/
-Build Version:1.45,52,1044,subdir=DroidFish,buildjni=no,target=android-10,prebuild=\
-cp -r ../CuckooChessEngine/src/* src/ && rm -rf obj/ assets/stockfish15.mygz && \
-$$NDK$$/ndk-build && ant copy_stockfish -f build_copy_exe.xml
-Build Version:1.47,54,1080,subdir=DroidFish,buildjni=no,target=android-10,prebuild=\
-cp -r ../CuckooChessEngine/src/* src/ && rm -rf obj/ assets/stockfish15.mygz && \
-$$NDK$$/ndk-build && ant copy_stockfish -f build_copy_exe.xml
-Build Version:1.50,57,1113,subdir=DroidFish,prebuild=\
-printf 'source.dir=src;../CuckooChessEngine/src' > ant.properties && \
-rm assets/stockfish15.mygz,build=$$NDK$$/ndk-build && \
-ant -f build_copy_exe.xml,buildjni=no
-Build Version:1.52,59,1124,subdir=DroidFish,prebuild=\
-printf 'source.dir=src;../CuckooChessEngine/src' > ant.properties && \
-rm assets/stockfish15.mygz,build=$$NDK$$/ndk-build && \
-ant -f build_copy_exe.xml,buildjni=no
+Build:1.44,51
+    commit=963
+    subdir=DroidFish
+    target=android-10
+    prebuild=cp -r ../CuckooChessEngine/src/* src/
+    buildjni=yes
+
+Build:1.45,52
+    commit=1044
+    subdir=DroidFish
+    target=android-10
+    prebuild=cp -r ../CuckooChessEngine/src/* src/ && \
+        rm -rf obj/ assets/stockfish15.mygz && \
+        $$NDK$$/ndk-build && \
+        ant copy_stockfish -f build_copy_exe.xml
+    buildjni=no
+
+Build:1.47,54
+    commit=1080
+    subdir=DroidFish
+    target=android-10
+    prebuild=cp -r ../CuckooChessEngine/src/* src/ && \
+        rm -rf obj/ assets/stockfish15.mygz && \
+        $$NDK$$/ndk-build && \
+        ant copy_stockfish -f build_copy_exe.xml
+    buildjni=no
+
+Build:1.50,57
+    commit=1113
+    subdir=DroidFish
+    prebuild=printf 'source.dir=src;../CuckooChessEngine/src' > ant.properties && \
+        rm assets/stockfish15.mygz
+    build=$$NDK$$/ndk-build && \
+        ant -f build_copy_exe.xml
+    buildjni=no
+
+Build:1.52,59
+    commit=1124
+    subdir=DroidFish
+    prebuild=printf 'source.dir=src;../CuckooChessEngine/src' > ant.properties && \
+        rm assets/stockfish15.mygz
+    build=$$NDK$$/ndk-build && \
+        ant -f build_copy_exe.xml
+    buildjni=no
+
+Build:1.53 DD,60
+    commit=1130
+    subdir=DroidFish
+    prebuild=printf 'source.dir=src;../CuckooChessEngine/src' > ant.properties && \
+        rm assets/stockfish15.mygz
+    build=$$NDK$$/ndk-build && \
+        ant -f build_copy_exe.xml
+    buildjni=no
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.52
-Current Version Code:59
+Current Version:1.53 DD
+Current Version Code:60
 
diff --git a/metadata/org.piwik.mobile.txt b/metadata/org.piwik.mobile.txt
index eecc44b699..121b1327a1 100644
--- a/metadata/org.piwik.mobile.txt
+++ b/metadata/org.piwik.mobile.txt
@@ -1,5 +1,5 @@
 Disabled:apks via here http://piwik.org/mobile/faq but lag a little. Already asked http://forum.piwik.org/read.php?2,77547. Would build with Titanium SDK but we don't support that
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://piwik.org/
 Source Code:https://github.com/piwik/piwik-mobile
diff --git a/metadata/org.piwik.mobile2.txt b/metadata/org.piwik.mobile2.txt
new file mode 100644
index 0000000000..bd915290d7
--- /dev/null
+++ b/metadata/org.piwik.mobile2.txt
@@ -0,0 +1,22 @@
+Categories:Internet
+License:GPLv3
+Web Site:http://www.piwik.org
+Source Code:https://github.com/piwik/piwik-mobile-2
+
+Auto Name:Piwik 2 Mobile
+Summary:Web Analytics
+Description:
+Piwik is a free and open source web analytics application written by a team of international developers that runs on a PHP/MySQL webserver.
+.
+
+Repo Type:git
+Repo:https://github.com/piwik/piwik-mobile-2.git
+
+Build:2.0.0,1
+    commit=92ca99c389
+    disable=needs titanium
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.0.1
+Current Version Code:1
diff --git a/metadata/org.pocketworkstation.pckeyboard.txt b/metadata/org.pocketworkstation.pckeyboard.txt
index b26dbf8731..ef50d7cf72 100644
--- a/metadata/org.pocketworkstation.pckeyboard.txt
+++ b/metadata/org.pocketworkstation.pckeyboard.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/hackerskeyboard/
-Source Code:http://code.google.com/p/hackerskeyboard/source/checkout
-Issue Tracker:http://code.google.com/p/hackerskeyboard/issues/list
+Source Code:http://code.google.com/p/hackerskeyboard/source
+Issue Tracker:http://code.google.com/p/hackerskeyboard/issues
 
 Name:Hacker's Keyboard
 Auto Name:Hacker's Keyboard
@@ -28,16 +28,58 @@ and audio recording for the voice input feature.
 Repo Type:hg
 Repo:https://hackerskeyboard.googlecode.com/hg/
 
-Build Version:v1.18,1018,8298cd8728c2,subdir=java,target=android-11,buildjni=yes
-Build Version:v1.20,1020,e703fa82a4c3,subdir=java,target=android-11,buildjni=yes
-Build Version:v1.22,1022,154e21230e81,subdir=java,target=android-11,buildjni=yes
-Build Version:v1.29,1029,1.29,subdir=java,target=android-11,buildjni=yes,prebuild=./AutoVersion.sh
-Build Version:v1.31,1031,065ed34b811c,subdir=java,target=android-11,buildjni=yes,prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && ./AutoVersion.sh
-Build Version:v1.33,1033,81d7ba77fb3f,subdir=java,target=android-11,buildjni=yes,prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && ./AutoVersion.sh
+Build:v1.18,1018
+    commit=8298cd8728c2
+    subdir=java
+    target=android-11
+    buildjni=yes
 
-Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:v1.33
-Current Version Code:1033
+Build:v1.20,1020
+    commit=e703fa82a4c3
+    subdir=java
+    target=android-11
+    buildjni=yes
+
+Build:v1.22,1022
+    commit=154e21230e81
+    subdir=java
+    target=android-11
+    buildjni=yes
+
+Build:v1.29,1029
+    commit=1.29
+    subdir=java
+    target=android-11
+    prebuild=./AutoVersion.sh
+    buildjni=yes
+
+Build:v1.31,1031
+    commit=065ed34b811c
+    subdir=java
+    target=android-11
+    prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && \
+        ./AutoVersion.sh
+    buildjni=yes
+
+Build:v1.33,1033
+    commit=v1.33
+    subdir=java
+    target=android-11
+    prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && \
+        ./AutoVersion.sh
+    buildjni=yes
+
+Build:v1.37,1037
+    commit=1.37
+    subdir=java
+    target=android-19
+    srclibs=1:VoiceIME@5763e36eab31
+    prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && \
+        ./AutoVersion.sh
+    buildjni=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:v1.37
+Current Version Code:1037
 
diff --git a/metadata/org.poirsouille.tinc_gui.txt b/metadata/org.poirsouille.tinc_gui.txt
index 3dedcc4b2b..1066054297 100644
--- a/metadata/org.poirsouille.tinc_gui.txt
+++ b/metadata/org.poirsouille.tinc_gui.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://tinc_gui.poirsouille.org/
 Source Code:https://github.com/Vilbrekin/tinc_gui
@@ -16,10 +16,12 @@ Root is not needed, even if highly recommended for correct tinc daemon usage.
 Repo Type:git
 Repo:https://github.com/Vilbrekin/tinc_gui.git
 
-Build Version:0.9.3,4,!we need to build res/raw/tincd RELEASE_0.9.3
+Build:0.9.3,4
+    disable=we need to build res/raw/tincd RELEASE_0.9.3
+    commit=unknown - see disabled
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.9.4
-Current Version Code:5
+Current Version:0.9.5
+Current Version Code:6
 
diff --git a/metadata/org.ppsspp.ppsspp.txt b/metadata/org.ppsspp.ppsspp.txt
index df6de4ab8f..984f4314f0 100644
--- a/metadata/org.ppsspp.ppsspp.txt
+++ b/metadata/org.ppsspp.ppsspp.txt
@@ -1,4 +1,5 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:GPLv2+
 Web Site:http://ppsspp.org/
 Source Code:https://github.com/hrydgard/ppsspp
@@ -10,45 +11,187 @@ Description:
 PPSSPP is a PSP emulator for Android and other platforms. It is being
 developed at a rapid speed and compatibility is increasing quickly, but there
 are many games it doesn't run yet and it doesn't run fast on Android yet.
+
 Please go to http://www.ppsspp.org for more information.
+
 No games are included with this download, you will have to dump your own PSP
 games and turn them into .ISO or .CSO files, or simply play free homebrew
 games, which are available online.
+
 * PSP is a trademark of Sony, Inc.
+
+A proprietary analytics library has been removed from this build.
 .
 
 Repo Type:git
 Repo:https://github.com/hrydgard/ppsspp.git
 
-Build Version:0.6.1,61,v0.6.1,target=android-10,subdir=android,submodules=yes,\
-update=.;../native/android,buildjni=no,prebuild=rm -rf ../pspautotests/demos*/,\
-build=NDK=$$NDK$$ ./ab.sh,forceversion=yes,forcevercode=yes
-Build Version:0.70,70,v0.7,target=android-10,subdir=android,submodules=yes,\
-update=.;../native/android,buildjni=no,prebuild=rm -rf ../pspautotests/demos*/,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.7.5,75,v0.7.5,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.7.6,76,v0.7.6,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.8,80,v0.8,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.8.1,81,v0.8.1,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.9.0,90,v0.9,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-# dev forgot to bump AM.xml
-Build Version:0.9.1,91,v0.9.1,subdir=android,submodules=yes,update=.;../native/android,\
-forceversion=yes,forcevercode=yes,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
+Build:0.6.1,61
+    commit=v0.6.1
+    subdir=android
+    submodules=yes
+    target=android-10
+    update=.;../native/android
+    forceversion=yes
+    forcevercode=yes
+    prebuild=rm -rf ../pspautotests/demos*/
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
 
+Build:0.70,70
+    commit=v0.7
+    subdir=android
+    submodules=yes
+    target=android-10
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.7.5,75
+    commit=v0.7.5
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.7.6,76
+    commit=v0.7.6
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.8,80
+    commit=v0.8
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.8.1,81
+    commit=v0.8.1
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.0,90
+    commit=v0.9
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+# dev forgot to bump AM.xml
+Build:0.9.1,91
+    commit=v0.9.1
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    forceversion=yes
+    forcevercode=yes
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.5-x86,951
+    commit=v0.9.5
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics* && \
+        echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
+    scandelete=ffmpeg
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
+        ./ax86-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.5-armv7,953
+    commit=v0.9.5
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics* && \
+        echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
+    scandelete=ffmpeg
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
+        ./android-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.6-x86,961
+    commit=v0.9.6
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=2:NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics*
+    scandelete=ffmpeg
+    scanignore=android/android-ndk-profiler
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
+        ./ax86-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.6-armv7,963
+    commit=v0.9.6
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=2:NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics*
+    scandelete=ffmpeg
+    scanignore=android/android-ndk-profiler
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
+        ./android-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+# +0: - (upstream)
+# +1: x86
+# +2: arm
+# +3: armv7 (CV)
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.9.0
-Current Version Code:90
+Vercode Operation:%c*10 + 3
+Current Version:0.9.6
+Current Version Code:963
 
diff --git a/metadata/org.primftpd.txt b/metadata/org.primftpd.txt
index 8accf3f7e9..fb4311cca2 100644
--- a/metadata/org.primftpd.txt
+++ b/metadata/org.primftpd.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/wolpi/prim-ftpd
 Source Code:https://github.com/wolpi/prim-ftpd
diff --git a/metadata/org.projectmaxs.main.txt b/metadata/org.projectmaxs.main.txt
index 2da654a761..c7cdecffd2 100644
--- a/metadata/org.projectmaxs.main.txt
+++ b/metadata/org.projectmaxs.main.txt
@@ -1,16 +1,15 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
-Auto Name:MAXS
+Auto Name:MAXS Main
 Summary:Main component of MAXS
 Description:
-MAXS development is in an early stage. MAXS and its components is
-therefore only recommended for advanced and experiences users for now.
-
 MAXS (Modular Android XMPP Service) allows you to receive
 notifications and remote control your Android device over XMPP. You
 will need at least one transport component and one module besides MAXS
@@ -20,13 +19,69 @@ main in order to make use of MAXS.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-subdir=main,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,prebuild=make prebuild,subdir=main
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=main
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=main
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.bluetooth.txt b/metadata/org.projectmaxs.module.bluetooth.txt
index b29addfdbe..79348b6ff8 100644
--- a/metadata/org.projectmaxs.module.bluetooth.txt
+++ b/metadata/org.projectmaxs.module.bluetooth.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module bluetooth
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-bluetooth/Makefile),\
-subdir=module-bluetooth,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-bluetooth/Makefile),subdir=module-bluetooth,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-bluetooth
+    init=cd .. && \
+        make module-bluetooth/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.bluetoothadmin.txt b/metadata/org.projectmaxs.module.bluetoothadmin.txt
index eaed806720..546d6dae27 100644
--- a/metadata/org.projectmaxs.module.bluetoothadmin.txt
+++ b/metadata/org.projectmaxs.module.bluetoothadmin.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module bluetoothadmin
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-bluetoothadmin/Makefile),\
-subdir=module-bluetoothadmin,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-bluetoothadmin/Makefile),subdir=module-bluetoothadmin,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-bluetoothadmin
+    init=cd .. && \
+        make module-bluetoothadmin/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.clipboard.txt b/metadata/org.projectmaxs.module.clipboard.txt
index 38a9b9e25c..484bce574f 100644
--- a/metadata/org.projectmaxs.module.clipboard.txt
+++ b/metadata/org.projectmaxs.module.clipboard.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module clipboard
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-clipboard/Makefile),\
-subdir=module-clipboard,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-clipboard/Makefile),subdir=module-clipboard,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-clipboard
+    init=cd .. && \
+        make module-clipboard/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.contactsread.txt b/metadata/org.projectmaxs.module.contactsread.txt
index 2911c0249d..d802fdb250 100644
--- a/metadata/org.projectmaxs.module.contactsread.txt
+++ b/metadata/org.projectmaxs.module.contactsread.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module contacts
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-contactsread/Makefile),\
-subdir=module-contactsread,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-contactsread/Makefile),subdir=module-contactsread,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-contactsread
+    init=cd .. && \
+        make module-contactsread/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.fileread.txt b/metadata/org.projectmaxs.module.fileread.txt
index 3af46fa16a..4eba26ea57 100644
--- a/metadata/org.projectmaxs.module.fileread.txt
+++ b/metadata/org.projectmaxs.module.fileread.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module fileread
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-fileread/Makefile),\
-subdir=module-fileread,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-fileread/Makefile),subdir=module-fileread,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-fileread
+    init=cd .. && \
+        make module-fileread/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.filewrite.txt b/metadata/org.projectmaxs.module.filewrite.txt
index 1ab376b8d4..47610c78ec 100644
--- a/metadata/org.projectmaxs.module.filewrite.txt
+++ b/metadata/org.projectmaxs.module.filewrite.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module filewrite
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-filewrite/Makefile),\
-subdir=module-filewrite,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-filewrite/Makefile),subdir=module-filewrite,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-filewrite
+    init=cd .. && \
+        make module-filewrite/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.phonestateread.txt b/metadata/org.projectmaxs.module.phonestateread.txt
index edf13819b7..8213467660 100644
--- a/metadata/org.projectmaxs.module.phonestateread.txt
+++ b/metadata/org.projectmaxs.module.phonestateread.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module phonestateread
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-phonestateread/Makefile),\
-subdir=module-phonestateread,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-phonestateread/Makefile),subdir=module-phonestateread,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-phonestateread
+    init=cd .. && \
+        make module-phonestateread/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.ringermode.txt b/metadata/org.projectmaxs.module.ringermode.txt
index a3e7151c90..6d342ee3b9 100644
--- a/metadata/org.projectmaxs.module.ringermode.txt
+++ b/metadata/org.projectmaxs.module.ringermode.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module ringermode
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-ringermode/Makefile),\
-subdir=module-ringermode,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-ringermode/Makefile),subdir=module-ringermode,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-ringermode
+    init=cd .. && \
+        make module-ringermode/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.smsnotify.txt b/metadata/org.projectmaxs.module.smsnotify.txt
index 891f7176df..8af579bd7c 100644
--- a/metadata/org.projectmaxs.module.smsnotify.txt
+++ b/metadata/org.projectmaxs.module.smsnotify.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module smsnotify
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-smsnotify/Makefile),\
-subdir=module-smsnotify,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-smsnotify/Makefile),subdir=module-smsnotify,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-smsnotify
+    init=cd .. && \
+        make module-smsnotify/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.smsread.txt b/metadata/org.projectmaxs.module.smsread.txt
index c76dbf69b4..5408bb2487 100644
--- a/metadata/org.projectmaxs.module.smsread.txt
+++ b/metadata/org.projectmaxs.module.smsread.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module smsread
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-smsread/Makefile),\
-subdir=module-smsread,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-smsread/Makefile),subdir=module-smsread,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-smsread
+    init=cd .. && \
+        make module-smsread/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.smssend.txt b/metadata/org.projectmaxs.module.smssend.txt
index 97893a5b40..5dc5a269bc 100644
--- a/metadata/org.projectmaxs.module.smssend.txt
+++ b/metadata/org.projectmaxs.module.smssend.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module smssend
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-smssend/Makefile),\
-subdir=module-smssend,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-smssend/Makefile),subdir=module-smssend,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-smssend
+    init=cd .. && \
+        make module-smssend/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.module.smswrite.txt b/metadata/org.projectmaxs.module.smswrite.txt
index 2c503e135e..1e3fc928af 100644
--- a/metadata/org.projectmaxs.module.smswrite.txt
+++ b/metadata/org.projectmaxs.module.smswrite.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Module smswrite
@@ -15,14 +17,93 @@ You need "MAXS Main" and a configured MAXS Transport to make use of it.
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-init=(cd .. && make module-smswrite/Makefile),\
-subdir=module-smswrite,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,init=(cd .. && make module-smswrite/Makefile),subdir=module-smswrite,prebuild=make prebuild
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=module-smswrite
+    init=cd .. && \
+        make module-smswrite/Makefile
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectmaxs.transport.xmpp.txt b/metadata/org.projectmaxs.transport.xmpp.txt
index 63f91d7246..779a82660c 100644
--- a/metadata/org.projectmaxs.transport.xmpp.txt
+++ b/metadata/org.projectmaxs.transport.xmpp.txt
@@ -1,8 +1,10 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://projectmaxs.org
-Source Code:https://bitbucket.org/projectmaxs/maxs/
-Issue Tracker:
+Source Code:http://projectmaxs.org/source
+Issue Tracker:http://projectmaxs.org/issues
+Donate:http://projectmaxs.org/donate
+FlattrID:2148361
 Bitcoin:1AUuXzvVUh1HMb2kVYnDWz8TgjbJMaZqDt
 
 Auto Name:MAXS Transport XMPP
@@ -16,13 +18,74 @@ make use of it!
 Repo Type:srclib
 Repo:ProjectMAXS
 
-Build Version:0.0.1.0,1,0.0.1.0,\
-subdir=transport-xmpp,\
-prebuild=make prebuild
-Build Version:0.0.1.1,2,0.0.1.1,prebuild=make prebuild,subdir=transport-xmpp
+Build:0.0.1.0,1
+    commit=0.0.1.0
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.1,2
+    commit=0.0.1.1
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.2,3
+    commit=0.0.1.2
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.3,4
+    commit=0.0.1.3
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.4,5
+    disable=build tools failure as per [https://bitbucket.org/projectmaxs/maxs/commits/7750c9add95016294c5be9afd84a8de4834f7f20]
+    commit=0.0.1.4
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.5,6
+    commit=0.0.1.5
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.6,7
+    commit=0.0.1.6
+    subdir=transport-xmpp
+    prebuild=make prebuild
+
+Build:0.0.1.7,8
+    commit=0.0.1.7
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
+
+Build:0.0.1.8,9
+    commit=0.0.1.8
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
+
+Build:0.0.1.9,10
+    commit=0.0.1.9
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
+
+Build:0.0.1.10,11
+    commit=0.0.1.10
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
+
+Build:0.0.1.11,12
+    commit=0.0.1.11
+    subdir=transport-xmpp
+    submodules=yes
+    prebuild=make prebuild
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:0.0.1.1
-Current Version Code:2
+Current Version:0.0.1.11
+Current Version Code:12
 
diff --git a/metadata/org.projectvoodoo.audiomeasurementsplayer.txt b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
index 34a77ea0b0..026ee2d384 100644
--- a/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
+++ b/metadata/org.projectvoodoo.audiomeasurementsplayer.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:https://github.com/project-voodoo/audio-measurements-player-app
 Source Code:https://github.com/project-voodoo/audio-measurements-player-app
diff --git a/metadata/org.projectvoodoo.otarootkeeper.txt b/metadata/org.projectvoodoo.otarootkeeper.txt
index 61e77ec285..717c668c45 100644
--- a/metadata/org.projectvoodoo.otarootkeeper.txt
+++ b/metadata/org.projectvoodoo.otarootkeeper.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:WTFPL
 Web Site:https://github.com/project-voodoo/ota-rootkeeper-app
 Source Code:https://github.com/project-voodoo/ota-rootkeeper-app
diff --git a/metadata/org.projectvoodoo.screentestpatterns.txt b/metadata/org.projectvoodoo.screentestpatterns.txt
index a41950e7d1..49fdb71370 100644
--- a/metadata/org.projectvoodoo.screentestpatterns.txt
+++ b/metadata/org.projectvoodoo.screentestpatterns.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:WTFPL
 Web Site:
 Source Code:https://github.com/project-voodoo/screen-test-patterns-app
diff --git a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
index 0735e82425..5f2188e649 100644
--- a/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
+++ b/metadata/org.projectvoodoo.simplecarrieriqdetector.txt
@@ -1,11 +1,11 @@
-Category:System
+Categories:System
 License:WTFPL
 Web Site:https://twitter.com/supercurio
 Source Code:https://github.com/project-voodoo/simple_carrieriq_detector_app
 Issue Tracker:https://github.com/project-voodoo/simple_carrieriq_detector_app/issues
 
 Auto Name:Voodoo CarrierIQ Detector
-Summary:Has the device spyware?
+Summary:Check for spyware on the device
 Description:
 CarrierIQ is a diagnostics tool that is embedded in the firmware of some Android phones
 .
@@ -16,11 +16,9 @@ Repo:https://github.com/project-voodoo/simple_carrieriq_detector_app.git
 Build Version:2.0.4,16,05512cb0
 
 Auto Update Mode:None
-#Build Version:2.0.5,18,!no source code
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.0.5
-Current Version Code:18
+Update Check Mode:RepoManifest
+Current Version:2.0.4
+Current Version Code:16
 
 No Source Since:2.0.5
 
diff --git a/metadata/org.pulpdust.lesserpad.txt b/metadata/org.pulpdust.lesserpad.txt
index f6be8d1e88..cb44fd391a 100644
--- a/metadata/org.pulpdust.lesserpad.txt
+++ b/metadata/org.pulpdust.lesserpad.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:http://kodakana.b.sourceforge.jp/
 Source Code:http://sourceforge.jp/users/kodakana/pf/Lesser_Pad/scm/
@@ -14,15 +14,49 @@ philosophy derived from the old Palm OS Memo Pad.
 Repo Type:git
 Repo:git://git.pf.sourceforge.jp/gitroot/k/ko/kodakana/Lesser_Pad.git
 
-Build Version:0.33,6,bfbbc136b,prebuild=rm -rf bin gen,target=android-14
-Build Version:0.35,7,028f1ec30e2,prebuild=rm -rf bin gen,target=android-14
-Build Version:0.38,8,44d4d081bd1393,prebuild=rm -rf bin/ gen/,target=android-14
-Build Version:0.4,9,5e68a4850218fc8,prebuild=rm -rf bin/ gen/,target=android-14
-Build Version:0.41,10,886de22a3c6ece,prebuild=rm -rf bin/ gen/,target=android-14
-Build Version:0.41b,11,6e01a8d44862b4
+Build:0.33,6
+    commit=bfbbc136b
+    target=android-14
+    prebuild=rm -rf bin gen
+
+Build:0.35,7
+    commit=028f1ec30e2
+    target=android-14
+    prebuild=rm -rf bin gen
+
+Build:0.38,8
+    commit=44d4d081bd1393
+    target=android-14
+    prebuild=rm -rf bin/ gen/
+
+Build:0.4,9
+    commit=5e68a4850218fc8
+    target=android-14
+    prebuild=rm -rf bin/ gen/
+
+Build:0.41,10
+    commit=886de22a3c6ece
+    target=android-14
+    prebuild=rm -rf bin/ gen/
+
+Build:0.41b,11
+    commit=6e01a8d44862b4
+
+Build:0.5,12
+    disable=weird errors
+    commit=0dd8906b9a25a59d4
+
+Build:0.5b,13
+    commit=a59aa5c9f41
+
+Build:0.5c,14
+    commit=a51e671
+
+Build:0.51,15
+    commit=9bec665ee6135b4b
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:0.41b
-Current Version Code:11
+Current Version:0.51
+Current Version Code:15
 
diff --git a/metadata/org.pyload.android.client.txt b/metadata/org.pyload.android.client.txt
index aa2f131c26..3661b577ae 100644
--- a/metadata/org.pyload.android.client.txt
+++ b/metadata/org.pyload.android.client.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://pyload.org
 Source Code:https://github.com/pyload/pyload-android
@@ -28,13 +28,23 @@ Repo Type:git
 Repo:https://github.com/pyload/pyload-android
 
 #Build Version:0.2.5,12,74ce7f5c81b0,prebuild=mv lib/* libs/ && rm -r lib/
-Build Version:0.3.2,15,e3c7c812e669a5225cf0a0a7183d827bde2a2eb9
-Build Version:0.3.3,16,45ec0fe5c7e001d7d29576e94ef78365793057f4
-Build Version:0.3.4,17,72b786555698ff3a1789bd0622b60f043110f9f3
+Build:0.3.2,15
+    commit=e3c7c812e669a5225cf0a0a7183d827bde2a2eb9
+
+Build:0.3.3,16
+    commit=45ec0fe5c7e001d7d29576e94ef78365793057f4
+
+Build:0.3.4,17
+    commit=72b786555698ff3a1789bd0622b60f043110f9f3
+
+Build:0.3.5,18
+    commit=14d4c7fc1ef2
+
+Build:0.3.6,19
+    commit=a9b68c1479b0
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.3.4
-Current Version Code:17
+Update Check Mode:RepoManifest
+Current Version:0.3.6
+Current Version Code:19
 
diff --git a/metadata/org.qii.weiciyuan.txt b/metadata/org.qii.weiciyuan.txt
index 32f1a52084..f51cd715eb 100644
--- a/metadata/org.qii.weiciyuan.txt
+++ b/metadata/org.qii.weiciyuan.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/qii/weiciyuan/wiki
 Source Code:https://github.com/qii/weiciyuan
@@ -19,8 +19,7 @@ Build Version:0.483,25,00a434ba7,rm=libs/android-support-v4.jar,\
 extlibs=android/android-support-v4.jar,prebuild=rm -rf libs/google-play-services_lib
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.483
 Current Version Code:25
 
diff --git a/metadata/org.quantumbadger.redreader.txt b/metadata/org.quantumbadger.redreader.txt
index f2b0f2f3ae..0871563e83 100644
--- a/metadata/org.quantumbadger.redreader.txt
+++ b/metadata/org.quantumbadger.redreader.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://redreader.org
 Source Code:https://github.com/QuantumBadger/RedReader
diff --git a/metadata/org.quovadit.apps.andof.txt b/metadata/org.quovadit.apps.andof.txt
new file mode 100644
index 0000000000..f5a1ebb5b7
--- /dev/null
+++ b/metadata/org.quovadit.apps.andof.txt
@@ -0,0 +1,28 @@
+Categories:Multimedia
+License:GPLv3
+Web Site:http://andof.quovadit.org
+Source Code:http://sourceforge.net/projects/andof/support
+Issue Tracker:http://sourceforge.net/p/andof/code
+
+Auto Name:anDOF
+Summary:Calculate DOF for photography
+Description:
+Simple app to calculate depth of field
+.
+
+Repo Type:git
+Repo:git://git.code.sf.net/p/andof/code
+
+Build:1.3,9
+    commit=v1.3
+    target=android-17
+
+Build:1.4,10
+    commit=v1.4
+    target=android-18
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.4
+Current Version Code:10
+
diff --git a/metadata/org.recentwidget.txt b/metadata/org.recentwidget.txt
index ed55898156..782ce4f800 100644
--- a/metadata/org.recentwidget.txt
+++ b/metadata/org.recentwidget.txt
@@ -1,8 +1,8 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:GPLv3
 Web Site:http://code.google.com/p/android-recent-widget
-Source Code:http://code.google.com/p/android-recent-widget/source/list
-Issue Tracker:http://code.google.com/p/android-recent-widget/issues/list
+Source Code:http://code.google.com/p/android-recent-widget/source
+Issue Tracker:http://code.google.com/p/android-recent-widget/issues
 
 Auto Name:Recent Contacts Widget
 Summary:Access contact info quickly
@@ -12,13 +12,15 @@ it aggregates the call log and the sms/mms received and displays them right on y
 .
 
 Repo Type:git-svn
-Repo:http://android-recent-widget.googlecode.com/svn/trunk/
+Repo:http://android-recent-widget.googlecode.com/svn/trunk/RecentWidget
 
-Build Version:0.4.4,6,83,subdir=RecentWidget,forceversion=yes,target=android-7,rm=RecentWidget/packages/RecentWidget.apk
+Build:0.4.4,6
+    commit=83
+    target=android-7
+    forceversion=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:0.4.4
+Update Check Mode:RepoManifest
+Current Version:0.4.4 [direct call, bugfixes ...]
 Current Version Code:6
 
diff --git a/metadata/org.retroarch.txt b/metadata/org.retroarch.txt
index 86dc77eeb8..47e9009909 100644
--- a/metadata/org.retroarch.txt
+++ b/metadata/org.retroarch.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3+
 # See also:
 # http://notaz.gp2x.de/pcsx_rearmed.php
@@ -33,16 +33,19 @@ Repo Type:git
 # https://github.com/libretro/libretro-super/blob/master/libretro-build-android-mk.sh
 Repo:git://github.com/libretro/RetroArch.git
 
-Build Version:0.9.9.6,22,7d25e64fb446af37ccc50693e5662d8d48b655e5,subdir=android/phoenix,\
-buildjni=no,srclibs=pcsx_rearmed@c6c27ccd79;bSNES@2b89497415,\
-prebuild=cp -R ../../media/overlays/ assets/,\
-build=\
-  $$NDK$$/ndk-build -C ../native && mv ../native/libs/ . && \
-  $$NDK$$/ndk-build -C $$pcsx_rearmed$$ APP_ABI=armeabi-v7a && \
-  mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro.so libs/armeabi-v7a/libretro_pcsx_rearmed-neon.so && \
-  $$NDK$$/ndk-build -C $$pcsx_rearmed$$ clean APP_ABI=armeabi-v7a && \
-  $$NDK$$/ndk-build -C $$pcsx_rearmed$$ NO_NEON=1 APP_ABI=armeabi-v7a && \
-  mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro-noneon.so libs/armeabi-v7a/libretro_pcsx_rearmed.so
+Build:0.9.9.6,22
+    commit=7d25e64fb446af37ccc50693e5662d8d48b655e5
+    subdir=android/phoenix
+    srclibs=pcsx_rearmed@c6c27ccd79;bSNES@2b89497415
+    prebuild=cp -R ../../media/overlays/ assets/
+    build=$$NDK$$/ndk-build -C ../native && \
+        mv ../native/libs/ . && \
+        $$NDK$$/ndk-build -C $$pcsx_rearmed$$ APP_ABI=armeabi-v7a && \
+        mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro.so libs/armeabi-v7a/libretro_pcsx_rearmed-neon.so && \
+        $$NDK$$/ndk-build -C $$pcsx_rearmed$$ clean APP_ABI=armeabi-v7a && \
+        $$NDK$$/ndk-build -C $$pcsx_rearmed$$ NO_NEON=1 APP_ABI=armeabi-v7a && \
+        mv $$pcsx_rearmed$$/libs/armeabi-v7a/libretro-noneon.so libs/armeabi-v7a/libretro_pcsx_rearmed.so
+    buildjni=no
 
 # TODO: Enable bSNES core, when server receives NDK r9 (it requires C11 features, which - 
 # according to my testing - aren't present in GCC 4.6 - according to my testing - and explicitely 
@@ -50,10 +53,9 @@ build=\
 #
 #  $$NDK$$/ndk-build -C $$bSNES$$/target-libretro/ APP_ABI="armeabi-v7a x86" && \
 #  mv $$bSNES$$/target-libretro/libs/ .
-
 Auto Update Mode:None
 # See http://forum.xda-developers.com/showthread.php?t=2116468 for exact release dates
-Update Check Mode:RepoManifest
-Current Version:0.9.9.7
-Current Version Code:25
+Update Check Mode:None
+Current Version:0.9.9.6
+Current Version Code:22
 
diff --git a/metadata/org.retroshare.android.txt b/metadata/org.retroshare.android.txt
new file mode 100644
index 0000000000..db8c15358d
--- /dev/null
+++ b/metadata/org.retroshare.android.txt
@@ -0,0 +1,33 @@
+Categories:Internet
+License:GPLv3+
+Web Site:http://www.retroshare.org/
+Source Code:https://gitorious.org/retroshare/retroshare-android-user-interface/
+Issue Tracker:
+
+Auto Name:RetroShare
+Summary:RetroShare user interface
+Description:
+A RetroShare Grafical Interface designed specifically for android which
+integrates with the system contact list.
+
+Status: Beta.
+.
+
+Repo Type:git
+Repo:https://git.gitorious.org/retroshare/retroshare-android-user-interface.git
+
+Build:0.2.4,7
+    commit=v0.2.4
+	disable=wip https://gitorious.org/retroshare/retroshare-android-user-interface/source/master:README.md
+    subdir=RetroShareAndroidIntegration
+    extlibs=android/android-support-v4.jar
+    srclibs=Protobuf@2.4.1
+    prebuild=echo "source.dir=../lib/rsctrl;../../$$Protobuf$$/src;." >> project.properties && \
+		cd ../lib && wget http://lag.net/jaramiko/download/jaramiko-151.zip && unzip jaramiko-151.zip && \
+        cd jaramiko-151 && ant jar
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.2.4
+Current Version Code:7
+
diff --git a/metadata/org.sagemath.droid.txt b/metadata/org.sagemath.droid.txt
index 9baef034ba..647f332a53 100644
--- a/metadata/org.sagemath.droid.txt
+++ b/metadata/org.sagemath.droid.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:http://www.sagemath.org
-Source Code:http://code.google.com/p/sage-android/source/checkout
-Issue Tracker:http://code.google.com/p/sage-android/issues/list
+Source Code:http://code.google.com/p/sage-android/source
+Issue Tracker:http://code.google.com/p/sage-android/issues
 
 Auto Name:Sage
 Summary:Calculation client
diff --git a/metadata/org.scid.android.txt b/metadata/org.scid.android.txt
index acafaeadd1..a66c692723 100644
--- a/metadata/org.scid.android.txt
+++ b/metadata/org.scid.android.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPL
 Web Site:https://code.google.com/p/scidonthego/
-Source Code:https://code.google.com/p/scidonthego/source/checkout
-Issue Tracker:https://code.google.com/p/scidonthego/issues/list
+Source Code:https://code.google.com/p/scidonthego/source
+Issue Tracker:https://code.google.com/p/scidonthego/issues
 
 Auto Name:Scid on the go
 Summary:View chess games
@@ -22,8 +22,7 @@ Build Version:1.39,40,255,buildjni=yes,target=android-15,extlibs=android/android
 Build Version:1.42,42,277,buildjni=yes,target=android-15,extlibs=android/android-support-v4.jar
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.42
 Current Version Code:42
 
diff --git a/metadata/org.scoutant.blokish.txt b/metadata/org.scoutant.blokish.txt
index d44ef47a5c..0d5a5b09bf 100644
--- a/metadata/org.scoutant.blokish.txt
+++ b/metadata/org.scoutant.blokish.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://blokish.scoutant.org/
 Source Code:https://github.com/scoutant/blokish
@@ -23,8 +23,7 @@ Build Version:1.9,12,fa7270b750f7,target=android-10
 Build Version:2.0,13,1305c946b10b,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0
 Current Version Code:13
 
diff --git a/metadata/org.scoutant.cc.txt b/metadata/org.scoutant.cc.txt
index 6206998272..76b0a323db 100644
--- a/metadata/org.scoutant.cc.txt
+++ b/metadata/org.scoutant.cc.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:
 Source Code:https://gitorious.org/chinese_checkers/chinese_checkers
diff --git a/metadata/org.scummvm.scummvm.txt b/metadata/org.scummvm.scummvm.txt
index 3d8a08eb0f..8505c8dfff 100644
--- a/metadata/org.scummvm.scummvm.txt
+++ b/metadata/org.scummvm.scummvm.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv2+
 Web Site:http://scummvm.org
 Source Code:https://github.com/scummvm/scummvm/
@@ -31,9 +31,8 @@ Unlike upstream build, this one has all plugins bundled together in single apk.
 Repo Type:git
 Repo:git://github.com/scummvm/scummvm.git
 
-Build Version:1.5.0,6,v1.5.0,\
-extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@b31465b840,\
-update=no,patch=fdroid_build.patch;latest_sdk.patch,bindir=.,antcommand="-p",\
+Build Version:1.5.0,6,v1.5.0,extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@18154,\
+update=no,patch=fdroid_build.patch;latest_sdk.patch;jdk7.patch,bindir=.,antcommand="-p",\
 init=echo -e '<project>\n<target name="Creating scummvm.apk for release..."/>\n</project>' > build.xml,\
 prebuild=\
   set -- $$SDK$$/build-tools/*/aapt && \
diff --git a/metadata/org.scummvm.scummvm/jdk7.patch b/metadata/org.scummvm.scummvm/jdk7.patch
new file mode 100644
index 0000000000..e6c0fe9930
--- /dev/null
+++ b/metadata/org.scummvm.scummvm/jdk7.patch
@@ -0,0 +1,22 @@
+diff --git a/backends/platform/android/org/scummvm/scummvm/Unpacker.java b/backends/platform/android/org/scummvm/scummvm/Unpacker.java
+index da76ceb..a750e2c 100644
+--- a/backends/platform/android/org/scummvm/scummvm/Unpacker.java
++++ b/backends/platform/android/org/scummvm/scummvm/Unpacker.java
+@@ -314,7 +314,7 @@ public class Unpacker extends Activity {
+ 			.queryBroadcastReceivers(intent, 0);
+ 		if (PLUGINS_ENABLED && plugins.isEmpty()) {
+ 			// No plugins installed
+-			AlertDialog.Builder alert = new AlertDialog.Builder(this)
++			/*AlertDialog.Builder alert = new AlertDialog.Builder(this)
+ 				.setTitle(R.string.no_plugins_title)
+ 				.setMessage(R.string.no_plugins_found)
+ 				.setIcon(android.R.drawable.ic_dialog_alert)
+@@ -348,7 +348,7 @@ public class Unpacker extends Activity {
+ 										});
+ 			}
+ 
+-			alert.show();
++			alert.show();*/
+ 
+ 		} else {
+ 			// Already have at least one plugin installed
diff --git a/metadata/org.servDroid.web.txt b/metadata/org.servDroid.web.txt
new file mode 100644
index 0000000000..ff413eb05f
--- /dev/null
+++ b/metadata/org.servDroid.web.txt
@@ -0,0 +1,31 @@
+Categories:Development
+License:Apache2
+Web Site:https://github.com/joanpuigsanz/servdroid/wiki
+Source Code:https://github.com/joanpuigsanz/servdroid
+Issue Tracker:https://github.com/joanpuigsanz/servdroid/issues
+
+Auto Name:ServDroid
+Summary:Web server
+Description:
+Auto start options
+* Can run under port 1024 (iptables and super user rights are required). Check the wiki for more information
+* Only serves HTML pages (Servlets implementations will be considered for in future versions).
+* Log of all requests are saved in the Android database. This information can be dumped to a text file.
+* ServDroid can be configured to vibrate when a request is received.
+* The 404 error page can be personalised.
+.
+
+Repo Type:git
+Repo:https://github.com/joanpuigsanz/servdroid.git
+
+Build:1.0.3,1000300
+    commit=1.0.3
+    subdir=android/ServDroid.web
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0.3
+Current Version Code:1000300
+
diff --git a/metadata/org.servalproject.maps.txt b/metadata/org.servalproject.maps.txt
index 78c1972402..ef22c8f4c6 100644
--- a/metadata/org.servalproject.maps.txt
+++ b/metadata/org.servalproject.maps.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:https://github.com/servalproject/ServalMaps
 Source Code:https://github.com/servalproject/ServalMaps
diff --git a/metadata/org.servalproject.txt b/metadata/org.servalproject.txt
index 3c8c2de725..de60c5387a 100644
--- a/metadata/org.servalproject.txt
+++ b/metadata/org.servalproject.txt
@@ -1,4 +1,4 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://www.servalproject.org
 Source Code:https://github.com/servalproject/batphone
@@ -56,7 +56,6 @@ buildjni=no
 
 # Releases are in master branch, beta in development; run ant version to get version info
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:0.91
 Current Version Code:2120
diff --git a/metadata/org.sickstache.txt b/metadata/org.sickstache.txt
index e50924a117..dcf1b40edb 100644
--- a/metadata/org.sickstache.txt
+++ b/metadata/org.sickstache.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/sick-stashe/
 Source Code:https://github.com/Buttink/sick-stache
-Issue Tracker:http://code.google.com/p/sick-stashe/issues/list
+Issue Tracker:http://code.google.com/p/sick-stashe/issues
 
 Auto Name:SickStache
 Summary:Sickbeard client
diff --git a/metadata/org.sipdroid.sipua.txt b/metadata/org.sipdroid.sipua.txt
index ead586aad7..d27993e0fe 100644
--- a/metadata/org.sipdroid.sipua.txt
+++ b/metadata/org.sipdroid.sipua.txt
@@ -1,9 +1,8 @@
-Disabled:jni hasn't been updated since 2010 and doesn't build with ndk-r8b
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:http://sipdroid.org/
-Source Code:http://code.google.com/p/sipdroid/source/checkout
-Issue Tracker:http://code.google.com/p/sipdroid/issues/list
+Source Code:http://code.google.com/p/sipdroid/source
+Issue Tracker:http://code.google.com/p/sipdroid/issues
 
 Auto Name:Sipdroid
 Summary:A SIP (VOIP) client
@@ -20,11 +19,13 @@ Recent developer builds can be obtained from the website.
 Repo Type:git-svn
 Repo:http://sipdroid.googlecode.com/svn/trunk
 
-Build Version:2.6 beta,89,!WIP 621,buildjni=yes,target=android-8,prebuild=\
-rm -rf libs/* && echo "APP_ABI := armeabi-v7a" jni/Application.mk
+Build:3.4 beta,97
+    commit=675
+    target=android-17
+    buildjni=yes
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:2.9
-Current Version Code:92
+Update Check Mode:RepoManifest
+Current Version:3.4 beta
+Current Version Code:97
 
diff --git a/metadata/org.sixgun.ponyexpress.txt b/metadata/org.sixgun.ponyexpress.txt
index d249c3c9b3..464f919369 100644
--- a/metadata/org.sixgun.ponyexpress.txt
+++ b/metadata/org.sixgun.ponyexpress.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://wiki.sixgun.org/ponyexpress/start
 Source Code:http://gitorious.org/ponyexpress
@@ -22,7 +22,7 @@ Build Version:1.1,12,1.1,target=android-10
 Build Version:1.1_,14,!not a release
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:1.1_d56e0055
 Current Version Code:14
 
diff --git a/metadata/org.smerty.zooborns.txt b/metadata/org.smerty.zooborns.txt
index 22cb74d8fb..78abc085dd 100644
--- a/metadata/org.smerty.zooborns.txt
+++ b/metadata/org.smerty.zooborns.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:NewBSD
 Web Site:https://github.com/Smerty/zooborns.android
 Source Code:https://github.com/Smerty/zooborns.android
diff --git a/metadata/org.softcatala.traductor.txt b/metadata/org.softcatala.traductor.txt
new file mode 100644
index 0000000000..e9d9064147
--- /dev/null
+++ b/metadata/org.softcatala.traductor.txt
@@ -0,0 +1,26 @@
+Categories:None
+License:GPLv2+
+Web Site:https://github.com/Softcatala/TraductorSoftcatalaAndroid
+Source Code:https://github.com/Softcatala/TraductorSoftcatalaAndroid
+Issue Tracker:https://github.com/Softcatala/TraductorSoftcatalaAndroid/issues
+
+Auto Name:Traductor Softcatalà
+Summary:Translate to and from Catalan
+Description:
+Client for the Softcatalà Catalan on-line [http://www.softcatala.org/traductor translation service].
+.
+
+Repo Type:git
+Repo:https://github.com/Softcatala/TraductorSoftcatalaAndroid.git
+
+Build:0.7.1,15
+    commit=v0.7.1
+    target=android-14
+    srclibs=1:MobAdMob@3bd7888479e4
+    scandelete=libs
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.7.1
+Current Version Code:15
+
diff --git a/metadata/org.sparkleshare.android.txt b/metadata/org.sparkleshare.android.txt
index fb20f4c04b..a08711a093 100644
--- a/metadata/org.sparkleshare.android.txt
+++ b/metadata/org.sparkleshare.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://www.sparkleshare.org
 Source Code:https://github.com/NewProggie/SparkleShare-Android
diff --git a/metadata/org.sshtunnel.txt b/metadata/org.sshtunnel.txt
index 2567adebb2..19d29ef0be 100644
--- a/metadata/org.sshtunnel.txt
+++ b/metadata/org.sshtunnel.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/sshtunnel
-Source Code:http://code.google.com/p/sshtunnel/source/list
-Issue Tracker:http://code.google.com/p/sshtunnel/issues/list
+Source Code:http://code.google.com/p/sshtunnel/source
+Issue Tracker:http://code.google.com/p/sshtunnel/issues
 
 Auto Name:SSHTunnel
 Summary:Browse internet via a proxy
diff --git a/metadata/org.subsurface.txt b/metadata/org.subsurface.txt
index 79e0a68ea5..d4c18063d8 100644
--- a/metadata/org.subsurface.txt
+++ b/metadata/org.subsurface.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPL
 Web Site:http://subsurface.hohndel.org
 Source Code:http://git.hohndel.org/index.cgi?p=subsurface.git;a=summary
diff --git a/metadata/org.sudowars.txt b/metadata/org.sudowars.txt
new file mode 100644
index 0000000000..8a774d978f
--- /dev/null
+++ b/metadata/org.sudowars.txt
@@ -0,0 +1,28 @@
+Categories:Games
+License:GPLv3
+Web Site:http://sudowars.org
+Source Code:https://github.com/sudowars/sudowars
+Issue Tracker:https://github.com/sudowars/sudowars/issues
+
+Auto Name:Sudowars
+Summary:Multiplayer sudoku
+Description:
+Sudowars is a Sudoku app which enables you to play Sudoku in multiplayer mode 
+over Bluetooth against another person. 
+In addition to that there is also a trainings mode, where you can play alone. 
+In the trainings mode you can ask for assistance through the game.
+.
+
+Repo Type:git
+Repo:https://github.com/sudowars/sudowars.git
+
+Build:1.1,2
+    commit=v1.1
+    subdir=Sudowars
+    rm=screenshots
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1
+Current Version Code:2
+
diff --git a/metadata/org.sufficientlysecure.keychain.txt b/metadata/org.sufficientlysecure.keychain.txt
index 661a9baf56..7fde57631c 100644
--- a/metadata/org.sufficientlysecure.keychain.txt
+++ b/metadata/org.sufficientlysecure.keychain.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://sufficientlysecure.org/index.php/openpgp-keychain/
 Source Code:https://github.com/dschuermann/openpgp-keychain
diff --git a/metadata/org.sufficientlysecure.localcalendar.txt b/metadata/org.sufficientlysecure.localcalendar.txt
index 22bae67ede..37fb3d8f55 100644
--- a/metadata/org.sufficientlysecure.localcalendar.txt
+++ b/metadata/org.sufficientlysecure.localcalendar.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://sufficientlysecure.org/index.php/android-apps/#offline 
 Source Code:https://github.com/dschuermann/local-calendar
@@ -21,16 +21,39 @@ Seltner; improved to work on Android 2.2 and above.
 Repo Type:git
 Repo:https://github.com/dschuermann/local-calendar.git
 
-Build Version:1.0,1,189ea0113f896515826d33f6cc0041c344a11159,subdir=Local-Calendar
-Build Version:1.1,2,v1.1,subdir=Local-Calendar,update=.;android-libs/HoloColorPicker/
-Build Version:1.2,3,v1.2,subdir=Offline-Calendar/src/main,\
-update=.;../../../libraries/HoloColorPicker,init=\
-echo "source.dir=java" > ant.properties && echo -e "target=android-17\n\
-android.library.reference.1=../../../libraries/HoloColorPicker" > project.properties
-Build Version:1.3,4,v1.3,subdir=Offline-Calendar,gradle=yes
+Build:1.0,1
+    commit=189ea0113f896515826d33f6cc0041c344a11159
+    subdir=Local-Calendar
+
+Build:1.1,2
+    commit=v1.1
+    subdir=Local-Calendar
+    update=.;android-libs/HoloColorPicker/
+
+Build:1.2,3
+    commit=v1.2
+    subdir=Offline-Calendar/src/main
+    init=echo "source.dir=java" > ant.properties && \
+        echo -e "target=android-17\nandroid.library.reference.1=../../../libraries/HoloColorPicker" > project.properties
+    update=.;../../../libraries/HoloColorPicker
+
+Build:1.3,4
+    commit=v1.3
+    subdir=Offline-Calendar
+    gradle=yes
+
+Build:1.4,5
+    commit=v1.4-buildfix
+    subdir=Offline-Calendar
+    gradle=yes
+
+Build:1.5,6
+    commit=v1.5
+    subdir=Offline-Calendar
+    gradle=yes
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:4
+Current Version:1.5
+Current Version Code:6
 
diff --git a/metadata/org.sufficientlysecure.standalonecalendar.txt b/metadata/org.sufficientlysecure.standalonecalendar.txt
new file mode 100644
index 0000000000..5ef1cecea3
--- /dev/null
+++ b/metadata/org.sufficientlysecure.standalonecalendar.txt
@@ -0,0 +1,27 @@
+Categories:System,Office
+License:Apache2
+Web Site:https://github.com/dschuermann/standalone-calendar
+Source Code:https://github.com/dschuermann/standalone-calendar
+Issue Tracker:https://github.com/dschuermann/standalone-calendar/issues
+
+Auto Name:Standalone Calendar
+Summary:AOSP calendar
+Description:
+Fork of the AOSP calendar, mainly for those who would like to have it
+installed but can't. It has a different package name to prevent conflicting
+with “com.android.calendar”.
+.
+
+Repo Type:git
+Repo:https://github.com/dschuermann/standalone-calendar.git
+
+Build:standalone-1.2,3
+    commit=standalone-1.2
+    submodules=yes
+    gradle=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest/standalone
+Current Version:standalone-1.2
+Current Version Code:3
+
diff --git a/metadata/org.sufficientlysecure.viewer.fontpack.txt b/metadata/org.sufficientlysecure.viewer.fontpack.txt
index 4cf987a473..0b9e9bb25d 100644
--- a/metadata/org.sufficientlysecure.viewer.fontpack.txt
+++ b/metadata/org.sufficientlysecure.viewer.fontpack.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:
 Source Code:https://github.com/dschuermann/document-viewer-fontpack
@@ -16,8 +16,12 @@ Repo:https://github.com/dschuermann/document-viewer-fontpack
 
 Build Version:2.1,2100,ac9b11451,subdir=fontpack
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.1
-Current Version Code:2100
+Build:2.2,2200
+    commit=v2.2
+    subdir=fontpack
+
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:2.2
+Current Version Code:2200
 
diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index ecf93bdf28..6149bc537c 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -1,4 +1,4 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:
 Source Code:https://github.com/dschuermann/document-viewer
@@ -22,11 +22,23 @@ This apk supports all ABIs: ARM, x86 and MIPS.
 Repo Type:git
 Repo:https://github.com/dschuermann/document-viewer.git
 
-Build Version:2.1,2100,v2.1,subdir=document-viewer,buildjni=yes
-Build Version:2.2,2200,v2.2,subdir=document-viewer,buildjni=yes
+Build:2.1,2100
+    commit=v2.1
+    subdir=document-viewer
+    buildjni=yes
 
-Auto Update Mode:None
+Build:2.2,2200
+    commit=v2.2
+    subdir=document-viewer
+    buildjni=yes
+
+Build:2.4,2400
+    commit=6888f6bae47cf1a47d
+    subdir=document-viewer
+    buildjni=yes
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:2.2
-Current Version Code:2200
+Current Version:2.4
+Current Version Code:2400
 
diff --git a/metadata/org.swiftp.txt b/metadata/org.swiftp.txt
index 886bd0e50f..93853c2844 100644
--- a/metadata/org.swiftp.txt
+++ b/metadata/org.swiftp.txt
@@ -2,8 +2,8 @@ Disabled:Superseded by be.ppareit...
 Category:Internet
 License:GPLv3+
 Web Site:http://code.google.com/p/swiftp/
-Source Code:http://code.google.com/p/swiftp/source/checkout
-Issue Tracker:http://code.google.com/p/swiftp/issues/list
+Source Code:http://code.google.com/p/swiftp/source
+Issue Tracker:http://code.google.com/p/swiftp/issues
 Donate:http://www.swiftp.org/donate.html
 
 Auto Name:SwiFTP
@@ -14,7 +14,7 @@ to files on your SD card (or any files on the device, optionally, if you have ro
 seems to have stopped developing it but it should still work fine.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://swiftp.googlecode.com/svn/trunk/
 
 Auto Update Mode:None
diff --git a/metadata/org.systemcall.scores.txt b/metadata/org.systemcall.scores.txt
new file mode 100644
index 0000000000..1fff76c00b
--- /dev/null
+++ b/metadata/org.systemcall.scores.txt
@@ -0,0 +1,39 @@
+Category:Games
+License:GPLv3+
+Web Site:
+Source Code:https://github.com/rengolin/cardgamescores
+Issue Tracker:https://github.com/rengolin/cardgamescores/issues
+
+Auto Name:Card Game Scores
+Summary:Track game score
+Description:
+The purpose is to keep scores for games where each turn could give you any
+(random) score, and not a fixed block; for that type of game, use
+[[com.nolanlawson.keepscore]].
+
+You have two options: "New Game" or "Last Game". On either of them, you can 
+add/delete people, change the maximum score and choose between win or lose at 
+that score.
+
+For example, on Uno, you can set the maximum score at 200 and set it to 
+lose, so that when someone crosses the 200 barrier, the game ends and a 
+"LOOSER" banner appear alongside the name who lost.
+
+During the game, a number box will be available for you to input the points 
+accumulated, with ENTER changing down for the next, and an empty box being the 
+same as zero points. After updating all scores, click on the update button.
+
+The app will save the data (names, score, win/lose) of your last game, so you 
+can re-use it later via the "Last Game" button.
+.
+
+Repo Type:git
+Repo:https://github.com/rengolin/cardgamescores.git
+
+Build Version:1.0,1,v0.2
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
index 41da53d862..8107a193b4 100644
--- a/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
+++ b/metadata/org.tamanegi.wallpaper.multipicture.dnt.txt
@@ -1,4 +1,4 @@
-Category:Wallpaper
+Categories:Wallpaper
 License:Public Domain
 Web Site:http://www.tamanegi.org/prog/android-apps/mplwp.html
 Source Code:https://github.com/lllllT/MultiPictureLiveWallpaper
diff --git a/metadata/org.tbrk.mnemododo.txt b/metadata/org.tbrk.mnemododo.txt
index 4e6cfb3b61..a472b97bd2 100644
--- a/metadata/org.tbrk.mnemododo.txt
+++ b/metadata/org.tbrk.mnemododo.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv2
 Web Site:http://tbrk.org/software/mnemododo.html
 Source Code:https://code.launchpad.net/~tbrk/mnemododo/trunk
@@ -25,8 +25,7 @@ prebuild=printf 'source.dir=src;$$mnemogogo$$/mobile/hexcsv' > ant.properties
 
 # Check for new versions of library: see srclib README
 Auto Update Mode:None
-# Tags and gplay
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:2.0.0
 Current Version Code:23
 
diff --git a/metadata/org.thialfihar.android.apg.txt b/metadata/org.thialfihar.android.apg.txt
index 9e64c17084..be087ffa9b 100644
--- a/metadata/org.thialfihar.android.apg.txt
+++ b/metadata/org.thialfihar.android.apg.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:Apache2
-Web Site:http://code.google.com/p/android-privacy-guard/
-Source Code:http://code.google.com/p/android-privacy-guard/source/checkout
-Issue Tracker:http://code.google.com/p/android-privacy-guard/issues/list
+Web Site:http://thialfihar.org/projects/apg
+Source Code:https://github.com/thialfihar/apg
+Issue Tracker:https://github.com/thialfihar/apg/issues
 FlattrID:164412
 
 Auto Name:APG
@@ -16,13 +16,15 @@ decrypting emails, as well as adding and verifying digital signatures.
 Repo Type:git
 Repo:https://github.com/thialfihar/apg.git
 
-Build Version:1.0.8,10900,bf6029124,forcevercode=yes,forceversion=yes,\
-extlibs=bc145_reduced_for_apg.zip,prebuild=\
-sed -i 's/minSdkVersion="3"/minSdkVersion="4"/g' AndroidManifest.xml && \
-unzip libs/bc145_reduced_for_apg.zip -d src/ && rm libs/bc145_reduced_for_apg.zip
+Build:1.0.9,10999
+    commit=1b25cd3ca1d0a
+    extlibs=bc145_reduced_for_apg.zip
+    prebuild=sed -i 's/minSdkVersion="3"/minSdkVersion="4"/g' AndroidManifest.xml && \
+        unzip libs/bc145_reduced_for_apg.zip -d src/ && \
+        rm -f libs/bc145_reduced_for_apg.zip ant.properties
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.0.8
-Current Version Code:10900
+Update Check Mode:RepoManifest/1.0.9-release
+Current Version:1.0.9
+Current Version Code:10999
 
diff --git a/metadata/org.tigase.messenger.phone.pro.txt b/metadata/org.tigase.messenger.phone.pro.txt
index 40f7fde390..5758fa18a2 100644
--- a/metadata/org.tigase.messenger.phone.pro.txt
+++ b/metadata/org.tigase.messenger.phone.pro.txt
@@ -1,4 +1,4 @@
-Category:Internet;Communication
+Categories:Internet
 License:AGPL
 Web Site:https://projects.tigase.org/projects/tigase-mobilemessenger
 Source Code:https://projects.tigase.org/projects/tigase-mobilemessenger/repository
diff --git a/metadata/org.tint.adblock.txt b/metadata/org.tint.adblock.txt
index ae5c27ac26..ab8c3034f0 100644
--- a/metadata/org.tint.adblock.txt
+++ b/metadata/org.tint.adblock.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/Anasthase/TintBrowserAdblockAddon
 Source Code:https://github.com/Anasthase/TintBrowserAdblockAddon
@@ -7,25 +7,22 @@ Issue Tracker:https://github.com/Anasthase/TintBrowserAdblockAddon/issues
 Auto Name:Tint Browser Adblock Addon
 Summary:Ad blocker
 Description:
-'''This is an addon for Tint Browser. It does nothing on its own, do not download if you do not have Tint Browser on your device.'''
+'''This is an addon for [[org.tint]]. It does nothing on its own.'''
 
-This is an addon based on the now defunct AdSweep script. It works by injecting a piece of Javascript
-after a page has finished loading. The Javascript then remove ads. You should see ads disapears after a
-few times.
-
-Extension for the Tint web browser built using
-the [https://github.com/Anasthase/TintBrowserAddonFrameworkLibrary Tint browser addon framework library]],
-licensed under Apache 2.0.
+This is an addon based on the now defunct AdSweep script. It works by injecting
+a piece of Javascript after a page has finished loading. The Javascript then
+removes ads.
 .
 
 Repo Type:git
 Repo:https://github.com/Anasthase/TintBrowserAdblockAddon.git
 
-Build Version:1.1,3,fece91e5,srclibs=TintAddon@1.5,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
+Build:1.1,3
+    commit=fece91e5
+    srclibs=TintAddon@1.5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
 
 Auto Update Mode:None
-#Tags are off; no version code in Market
 Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:3
diff --git a/metadata/org.tint.txt b/metadata/org.tint.txt
index 402ec7ff39..350bbfc572 100644
--- a/metadata/org.tint.txt
+++ b/metadata/org.tint.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://github.com/Anasthase/TintBrowser
 Source Code:https://github.com/Anasthase/TintBrowser
@@ -19,14 +19,32 @@ Enhanced version of the stock browser, featuring:
 Repo Type:git
 Repo:https://github.com/Anasthase/TintBrowser.git
 
-Build Version:1.5,6,1.5,srclibs=TintAddon@1.5,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
-Build Version:1.6,7,1.6,srclibs=TintAddon@1.5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
-Build Version:1.6.1,8,1.6.1,srclibs=TintAddon@1.5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
-Build Version:1.7,9,1.7,srclibs=TintAddon@1.5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
+Build:1.5,6
+    commit=1.5
+    srclibs=TintAddon@1.5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
 
-Auto Update Mode:Version %v
+Build:1.6,7
+    commit=1.6
+    srclibs=TintAddon@1.5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
+
+Build:1.6.1,8
+    commit=1.6.1
+    srclibs=TintAddon@1.5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
+
+Build:1.7,9
+    commit=1.7
+    srclibs=TintAddon@1.5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$TintAddon$$@' project.properties
+
+Build:1.8,10
+    commit=1.8
+    srclibs=1:TintAddon@1.8
+
+Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.7
-Current Version Code:9
+Current Version:1.8
+Current Version Code:10
 
diff --git a/metadata/org.tof.txt b/metadata/org.tof.txt
index 818d8bb38b..cb5464afa8 100644
--- a/metadata/org.tof.txt
+++ b/metadata/org.tof.txt
@@ -1,8 +1,8 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://code.google.com/p/tapsoffire/
-Source Code:http://code.google.com/p/tapsoffire/source/checkout
-Issue Tracker:http://code.google.com/p/tapsoffire/issues/list
+Source Code:http://code.google.com/p/tapsoffire/source
+Issue Tracker:http://code.google.com/p/tapsoffire/issues
 
 Auto Name:Taps Of Fire (1.0.5 Droid)
 Summary:Guitar Game
diff --git a/metadata/org.tomdroid.txt b/metadata/org.tomdroid.txt
index a0934b9958..70333a3d8e 100644
--- a/metadata/org.tomdroid.txt
+++ b/metadata/org.tomdroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3+
 Web Site:https://launchpad.net/tomdroid
 Source Code:https://launchpad.net/tomdroid/stable
@@ -20,20 +20,33 @@ while that for the stable versions is in the stable branch.
 of changes to the stable version.
 .
 
-#Stable version 0.6.1 couldn't be built on lp:tomdroid
-#Switching to lp:tomdroid/stable breaks beta versions 0.7.1 and 0.7.2
 Repo Type:bzr
 Repo:lp:tomdroid/stable
 
-Build Version:0.4.1,6,214
-Build Version:0.5.0,7,248
+Build:0.4.1,6
+    commit=214
+
+Build:0.5.0,7
+    commit=248
+
 #Build Version:0.7.1,10,400
 #Build Version:0.7.2,11,469,extlibs=android/android-support-v4.jar
-Build Version:0.6.1,9,0.6.1
+Build:0.6.1,9
+    commit=0.6.1
+
+Build:0.7.5,14
+    commit=321
+    target=android-19
+
+Maintainer Notes:
+0.7.1 and 0.7.2 were previously built from a different branch (lp:tomdroid)
+which was then switched away from in favour of lp:tomdroid/stable, so although
+we have the binaries built, the build data (commented out) doesn't work for
+them.
+.
 
 Auto Update Mode:None
-# Tags and gplay
 Update Check Mode:RepoManifest
-Current Version:0.6.1
-Current Version Code:9
+Current Version:0.8.0dev
+Current Version Code:15
 
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 469ca00576..fb7d289017 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:NewBSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://gitweb.torproject.org/orbot.git
@@ -35,21 +35,34 @@ Repo Type:git
 Repo:git://git.torproject.org/orbot.git
 
 #Most recent binaries from https://dev.guardianproject.info/projects/orbot/files
-Build Version:0.2.3.23-rc-1.0.11-RC5-test2,51,ff38bf4e5,submodules=yes,\
-srclibs=ActionBarSherlock@4.1.0,prebuild=\
-sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-export NDK_BASE=$$NDK$$ && export PATH=$PATH:$$NDK$$/toolchain/bin && \
-sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && make -C external
-Build Version:12.0.1,57,!not a release; problems building libevent; iptables blobs https://dev.guardianproject.info/issues/1735,\
-submodules=yes,\
-update=.;external/ActionBarSherlock/actionbarsherlock,\
-prebuild=sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && \
-         cd res/raw/ && rm iptables* obfsproxy privoxy tor.mp3,\
-build=NDK_BASE=$$NDK$$ make -C external
-Build Version:12.0.5,61,!Binary blobs of unknown origin - https://dev.guardianproject.info/issues/1735
+Build:0.2.3.23-rc-1.0.11-RC5-test2,51
+    commit=ff38bf4e5
+    submodules=yes
+    srclibs=ActionBarSherlock@4.1.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        export NDK_BASE=$$NDK$$ && \
+        export PATH=$PATH:$$NDK$$/toolchain/bin && \
+        sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && \
+        make -C external
+
+Build:12.0.1,57
+    disable=not a release; problems building libevent; iptables blobs https://dev.guardianproject.info/issues/1735
+    commit=unknown - see disabled
+    submodules=yes
+    update=.;external/ActionBarSherlock/actionbarsherlock
+    prebuild=sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && \
+        cd res/raw/ && \
+        rm iptables* obfsproxy privoxy tor.mp3
+    build=NDK_BASE=$$NDK$$ make -C external
+
+Build:12.0.5,61
+    disable=Binary blobs of unknown origin - https://dev.guardianproject.info/issues/1735
+
+Build:13.0.0,63
+    disable=Binary blobs of unknown origin - https://dev.guardianproject.info/issues/1735 - check at 14.0
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:12.0.5
-Current Version Code:61
+Current Version:13.0.4a
+Current Version Code:69
 
diff --git a/metadata/org.totschnig.myexpenses.txt b/metadata/org.totschnig.myexpenses.txt
index 7f85396666..772f2f619a 100644
--- a/metadata/org.totschnig.myexpenses.txt
+++ b/metadata/org.totschnig.myexpenses.txt
@@ -1,62 +1,173 @@
-Category:Office
+Categories:Office
 License:GPLv3
-Web Site:http://myexpenses.totschnig.org
+Web Site:http://www.myexpenses.mobi
 Source Code:https://github.com/mtotschnig/MyExpenses
 Issue Tracker:https://github.com/mtotschnig/MyExpenses/issues
-Donate:http://myexpenses.totschnig.org/#donate
+Donate:http://www.myexpenses.mobi/#donate
 FlattrID:1028216
+Bitcoin:1GCUGCSfFXzSC81ogHu12KxfUn3cShekMn
 
 Auto Name:My Expenses
 Summary:Manage finances
 Description:
-'''N.B''' v1.7.1 has certain features that are only available as a trial.
-You can request a Contrib (unlock) key from the author in return for a technical
-or monetary contribution by emailing him via the app Settings with a description
-of your contribution.
-
 MyExpenses is designed to keep track of expenses, and to export these expenses
-as QIF files
-into a finance program (e.g.: Grisbi, GnuCash). There are tutorials on the
-website.
+as QIF files into a finance program (e.g.: Grisbi, GnuCash).
 
 Features:
-* multiple accounts with transfers.
-* two levels of categories (import from Grisbi XML)
-* upload QIF file via FTP or email
-* data backup and restore
+* Up to five accounts with transfers (unlimited in Contrib version)
+* Define plans (3) for future and recurrent transactions  (unlimited in Contrib version)
+* Group transactions per day, week, month, year and display sums per group
+* Two levels of categories (import from Grisbi XML), display distribution of transactions in Contrib version
+* Split transactions (Contrib version)
+* Calculator
+* Export to QIF and CSV (MS Excel), can be automatically shared (via email, FTP, Dropbox, ...) and done in batch in Contrib version
+* Password protection, recoverable with security question in Contrib version
+* Integrated Help
+* Create transactions from templates
+* Data backup and restore
+* Aggregate financial situation (Contrib version)
+* Two themes: light and dark
 .
 
 Repo Type:git
 Repo:https://github.com/mtotschnig/MyExpenses.git
 
-Build Version:1.5.1,33,db50b87307,prebuild=rm -rf tests
-Build Version:1.6.0,34,5fa677d646,prebuild=rm -rf tests
-Build Version:1.6.5,35,e3d51bb02f,prebuild=rm -rf tests
-Build Version:1.6.6,36,f937fd21cc,prebuild=rm -rf tests
-Build Version:1.6.8,38,r38,prebuild=rm -rf tests
-Build Version:1.7.1,40,r40,extlibs=android/android-support-v4.jar,prebuild=rm -rf tests
-Build Version:1.7.3.1,43,r43,extlibs=android/android-support-v4.jar,prebuild=rm -rf tests
-Build Version:1.7.4.3,55,r55,extlibs=android/android-support-v4.jar,prebuild=rm -rf tests
-Build Version:1.8.5,63,r63,\
-srclibs=ActionBarSherlock@4.3.1,\
-extlibs=android/android-support-v4r11.jar,\
-prebuild=rm -rf tests && sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
-Build Version:1.9.0.3,70,r70,\
-srclibs=ActionBarSherlock@4.3.1,\
-extlibs=android/android-support-v4r11.jar,\
-prebuild=rm -rf tests && sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-         mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
-Build Version:1.9.6.2,81,r81,\
-srclibs=ActionBarSherlock@4.3.1;StickyListHeaders-tots@270b239cb1c2,\
-extlibs=android/android-support-v4r11.jar,\
-prebuild=rm -rf tests && \
-	sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-	sed -i 's@\(.2=\).*@\1$$StickyListHeaders-tots$$@' project.properties && \
-       	mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+Build:1.5.1,33
+    commit=db50b87307
+    prebuild=rm -rf tests
+
+Build:1.6.0,34
+    commit=5fa677d646
+    prebuild=rm -rf tests
+
+Build:1.6.5,35
+    commit=e3d51bb02f
+    prebuild=rm -rf tests
+
+Build:1.6.6,36
+    commit=f937fd21cc
+    prebuild=rm -rf tests
+
+Build:1.6.8,38
+    commit=r38
+    prebuild=rm -rf tests
+
+Build:1.7.1,40
+    commit=r40
+    extlibs=android/android-support-v4.jar
+    prebuild=rm -rf tests
+
+Build:1.7.3.1,43
+    commit=r43
+    extlibs=android/android-support-v4.jar
+    prebuild=rm -rf tests
+
+Build:1.7.4.3,55
+    commit=r55
+    extlibs=android/android-support-v4.jar
+    prebuild=rm -rf tests
+
+Build:1.8.5,63
+    commit=r63
+    extlibs=android/android-support-v4r11.jar
+    srclibs=ActionBarSherlock@4.3.1
+    prebuild=rm -rf tests && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.9.6.2,81
+    disable=Build fails
+    commit=r81
+    extlibs=android/android-support-v4r11.jar
+    srclibs=ActionBarSherlock@4.3.1;StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$StickyListHeaders-tots$$@' project.properties && \
+        mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.9.7.1,85
+    commit=r85
+    extlibs=android/android-support-v4r11.jar
+    srclibs=ActionBarSherlock@4.3.1;StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$StickyListHeaders-tots$$@' project.properties && \
+        mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.9.7.3,87
+    commit=r87
+    extlibs=android/android-support-v4r11.jar
+    srclibs=ActionBarSherlock@4.3.1;StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        sed -i 's@\(.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(.2=\).*@\1$$StickyListHeaders-tots$$@' project.properties && \
+        mv libs/android-support-v4r11.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.0,93
+    commit=r93
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.1,95
+    commit=r95
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.1.2,97
+    commit=r97
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders-tots@270b239cb1c2
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.3,102
+    commit=r102
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.3
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.4,104
+    commit=r104
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.3
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.10.5,108
+    commit=r108
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.4
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.11.0,110
+    commit=r110
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.4
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.11.0.3,113
+    commit=r113
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.4
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
+
+Build:1.11.5,116
+    commit=r116
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0;2:StickyListHeaders@2.1.4
+    prebuild=rm -rf tests && \
+        mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/android-support-v4.jar
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.9.6.2
-Current Version Code:81
+Current Version:1.11.5
+Current Version Code:116
 
diff --git a/metadata/org.totschnig.sendwithftp.txt b/metadata/org.totschnig.sendwithftp.txt
index bbb458accd..2dda2de014 100644
--- a/metadata/org.totschnig.sendwithftp.txt
+++ b/metadata/org.totschnig.sendwithftp.txt
@@ -1,10 +1,11 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://mtotschnig.github.com/SendWithFtp
 Source Code:https://github.com/mtotschnig/SendWithFtp
 Issue Tracker:https://github.com/mtotschnig/SendWithFtp/issues
 Donate:http://mtotschnig.github.com/SendWithFtp
 FlattrID:1088413
+Bitcoin:1Dmj6keLGgNHBUD5unsbZz5vnk9wRinRAy
 
 Auto Name:&app_name;
 Summary:Upload files via FTP
diff --git a/metadata/org.traccar.client.txt b/metadata/org.traccar.client.txt
index 6ed7851d3a..44618823a8 100644
--- a/metadata/org.traccar.client.txt
+++ b/metadata/org.traccar.client.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:https://www.traccar.org
 Source Code:https://github.com/tananaev/traccar-client-android
diff --git a/metadata/org.transdroid.full.txt b/metadata/org.transdroid.full.txt
new file mode 100644
index 0000000000..2119a0220b
--- /dev/null
+++ b/metadata/org.transdroid.full.txt
@@ -0,0 +1,35 @@
+Categories:Internet
+License:GPLv3
+Web Site:http://www.transdroid.org/
+Source Code:https://github.com/erickok/transdroid
+Issue Tracker:https://github.com/erickok/transdroid/issues
+Donate:http://www.transdroid.org/
+
+Auto Name:Transdroid
+Summary:Manage BitTorrent clients
+Description:
+Transdroid is an Android remote client for your torrent application running on a
+server or home computer. Currently Transmission, uTorrent, Bittorrent, Deluge, Vuze
+and rTorrent are supported. It can show the active torrents, pause, resume or remove
+them and new torrents can be added via URL, RSS feed or using the integrated search.
+
+See also [[org.transdroid.search]].
+.
+
+Repo Type:git
+Repo:https://github.com/erickok/transdroid.git
+
+Build:2.1.2,211
+    commit=v2.1.2
+    subdir=full
+    patch=java6source.patch
+    prebuild=ant -f ../lib/build.xml && \
+        sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;' ../core/res/values/bools.xml && \
+        sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;' res/values/bools.xml && \
+        mkdir src
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:2.1.2
+Current Version Code:211
+
diff --git a/metadata/org.transdroid.full/java6source.patch b/metadata/org.transdroid.full/java6source.patch
new file mode 100644
index 0000000000..3af25eaebb
--- /dev/null
+++ b/metadata/org.transdroid.full/java6source.patch
@@ -0,0 +1,22 @@
+commit 93e997d442d617226c3dc307719e9b752f037e91
+Author: Florian Schmaus <flo@geekplace.eu>
+Date:   Thu Dec 19 10:58:31 2013 +0100
+
+    lib/build.xml: Also set javac source to java6
+    
+    "javac: target release 6 conflicts with default source release 1.7"
+    error will be emitted if a java7 compiler is used and target is set to 6
+    but not source.
+
+diff --git a/lib/build.xml b/lib/build.xml
+index 066dfff..d480d57 100644
+--- a/lib/build.xml
++++ b/lib/build.xml
+@@ -20,6 +20,7 @@
+ 	srcdir="src/"
+ 	destdir="build/"
+ 	bootclasspath="${sdk-location}/platforms/${android.version}/android.jar"
++	source="6"
+ 	target="6"
+ 	/>
+     <jar
diff --git a/metadata/org.transdroid.search.txt b/metadata/org.transdroid.search.txt
index 84c9d868b0..4da986701d 100644
--- a/metadata/org.transdroid.search.txt
+++ b/metadata/org.transdroid.search.txt
@@ -1,9 +1,8 @@
-AntiFeatures:Tracking
-Category:Internet
+Categories:Internet
 License:LGPL
-Web Site:http://code.google.com/p/transdroid-search/
-Source Code:http://code.google.com/p/transdroid-search/source/checkout
-Issue Tracker:http://code.google.com/p/transdroid-search/issues/list
+Web Site:http://www.transdroid.org/
+Source Code:https://github.com/erickok/transdroid-search
+Issue Tracker:https://github.com/erickok/transdroid-search/issues
 
 Name:Transdroid Torrent Search
 Auto Name:Torrent Search (by Transdroid)
@@ -15,20 +14,33 @@ sources. These results are exposed via a ContentProvider that multiple Android
 apps can use to search for torrents while maintaining control over the search
 interface.
 
-Anti-feature: Tracking. It checks for updates to the app.			
+See also [[org.transdroid.full]].
 .
 
-Repo Type:git-svn
-Repo:http://transdroid-search.googlecode.com/svn/trunk
+Repo Type:git
+Repo:https://github.com/erickok/transdroid-search.git
 
 #Don't have android-13
-Build Version:1.7,9,22,target=android-14
-Build Version:1.9,11,28,target=android-14
-Build Version:1.10,12,29,target=android-14
-Build Version:1.11,13,33
+Build:1.7,9
+    commit=22
+    target=android-14
+
+Build:1.9,11
+    commit=28
+    target=android-14
+
+Build:1.10,12
+    commit=29
+    target=android-14
+
+Build:1.11,13
+    commit=33
+
+Build:1.14,16
+    commit=v1.14
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.11
-Current Version Code:13
+Update Check Mode:Tags
+Current Version:1.14
+Current Version Code:16
 
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index ed54b83f27..a04c570033 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -1,9 +1,9 @@
 AntiFeatures:Tracking
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://www.transdroid.org/
-Source Code:http://code.google.com/p/transdroid/source/list
-Issue Tracker:http://code.google.com/p/transdroid/issues/list
+Source Code:http://code.google.com/p/transdroid/source
+Issue Tracker:http://code.google.com/p/transdroid/issues
 Donate:http://www.transdroid.org/
 
 Auto Name:Transdroid Torrent Manager
@@ -17,6 +17,8 @@ them and new torrents can be added via URL, RSS feed or using the integrated sea
 Anti-Feature: Tracking. It will connect to transdroid.org as
 soon as you run it, and periodically after that. Information exposed is probably
 limited to your IP address, OS version and Transdroid version.
+
+For newer versions, see [[org.transdroid.full]] and [[org.transdroid.search]].
 .
 
 Repo Type:hg
diff --git a/metadata/org.tryton.client.txt b/metadata/org.tryton.client.txt
index 68994c3861..9d04030770 100644
--- a/metadata/org.tryton.client.txt
+++ b/metadata/org.tryton.client.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://trac.scil.coop/tryton_android
 Source Code:http://trac.scil.coop/tryton_android/browser
diff --git a/metadata/org.ttrssreader.txt b/metadata/org.ttrssreader.txt
index e95ed94c3f..1237340b1b 100644
--- a/metadata/org.ttrssreader.txt
+++ b/metadata/org.ttrssreader.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/ttrss-reader-fork/
-Source Code:http://code.google.com/p/ttrss-reader-fork/source/checkout
-Issue Tracker:http://code.google.com/p/ttrss-reader-fork/issues/list
+Source Code:http://code.google.com/p/ttrss-reader-fork/source
+Issue Tracker:http://code.google.com/p/ttrss-reader-fork/issues
 Donate:http://code.google.com/p/ttrss-reader-fork/wiki/Donations
 FlattrID:382465
 
@@ -16,45 +16,244 @@ tt-rss) web-based feed reader/aggregator.
 Repo Type:hg
 Repo:https://ttrss-reader-fork.googlecode.com/hg/
 
-Build Version:1.0,1000,1efaebb5678f,subdir=ttrss-reader,target=android-8
-Build Version:1.0,1002,aa503a0f2201,subdir=ttrss-reader,target=android-8
-Build Version:1.02,1023,87f123514c11,subdir=ttrss-reader,target=android-8
-Build Version:1.03,1032,c374163ba16f,subdir=ttrss-reader,target=android-8
-Build Version:1.04,1040,1.04,subdir=ttrss-reader,target=android-8
-Build Version:1.05,1050,bb0bbb042e7c,subdir=ttrss-reader,target=android-8
-Build Version:1.07,1075,1.07 (4),subdir=ttrss-reader,target=android-8
+Build:1.0,1000
+    commit=1efaebb5678f
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.0,1002
+    commit=aa503a0f2201
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.02,1023
+    commit=87f123514c11
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.03,1032
+    commit=c374163ba16f
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.04,1040
+    commit=1.04
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.05,1050
+    commit=bb0bbb042e7c
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.07,1075
+    commit=1.07 (4)
+    subdir=ttrss-reader
+    target=android-8
+
 #This is not building - No resource identifier found for attribute 'marginRight' in package 'android'
 #Build Version:1.08,1080,1.08,subdir=ttrss-reader,target=android-8
-Build Version:1.21,1210,1.21,subdir=ttrss-reader,target=android-8
-Build Version:1.22,1220,1.22,subdir=ttrss-reader,target=android-8
-#The 1.23 tag is wrong...
-Build Version:1.23,1230,1e255c7e32ae,subdir=ttrss-reader,target=android-8
-Build Version:1.24,1240,fb656e839908,subdir=ttrss-reader,target=android-8
-Build Version:1.25,1253,69d2376a53f2,subdir=ttrss-reader,target=android-13
-Build Version:1.25,1254,!broken - crashes on startup
-Build Version:1.26,1260,a07a4adf2cc8,subdir=ttrss-reader,target=android-13
-Build Version:1.26,1261,9d7fb8923653,subdir=ttrss-reader,target=android-13
-Build Version:1.3,1302,78751fbd9edc,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.32,1320,236793708946,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.33,1330,09d31c76076542a0d705937daaac7c682019fc44,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.34,1340,a3af08a3b019,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.38,1380,ee51a2579898,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.40,1400,c91741406ead,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.41,1411,f7f84c03ed4a,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.43,1431,1.43,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.44,1441,1.44,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.45,1450,1.45,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.46,1462,7371059e9000,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.51,1512,1.51 (2),subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.52,1520,1.52,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.53,1535,1bfb2b3b6297,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.60,1600,1.60,subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.61,1611,1.61 (1),subdir=ttrss-reader,target=android-17,srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
-Build Version:1.62,1621,1.62 (1),subdir=ttrss-reader,target=android-18,srclibs=ActionBarSherlock@4.4.0;LocaleAPI@bc2d5a1,prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+Build:1.21,1210
+    commit=1.21
+    subdir=ttrss-reader
+    target=android-8
 
+Build:1.22,1220
+    commit=1.22
+    subdir=ttrss-reader
+    target=android-8
+
+#The 1.23 tag is wrong...
+Build:1.23,1230
+    commit=1e255c7e32ae
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.24,1240
+    commit=fb656e839908
+    subdir=ttrss-reader
+    target=android-8
+
+Build:1.25,1253
+    commit=69d2376a53f2
+    subdir=ttrss-reader
+    target=android-13
+
+Build:1.25,1254
+    disable=broken - crashes on startup
+    commit=unknown - see disabled
+
+Build:1.26,1260
+    commit=a07a4adf2cc8
+    subdir=ttrss-reader
+    target=android-13
+
+Build:1.26,1261
+    commit=9d7fb8923653
+    subdir=ttrss-reader
+    target=android-13
+
+Build:1.3,1302
+    commit=78751fbd9edc
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.32,1320
+    commit=236793708946
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.33,1330
+    commit=09d31c76076542a0d705937daaac7c682019fc44
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.34,1340
+    commit=a3af08a3b019
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.38,1380
+    commit=ee51a2579898
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.40,1400
+    commit=c91741406ead
+    subdir=ttrss-reader
+    target=android-15
+    srclibs=ActionBarSherlock@6e3f2bb5
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.41,1411
+    commit=f7f84c03ed4a
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+
+Build:1.43,1431
+    commit=1.43
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.44,1441
+    commit=1.44
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.45,1450
+    commit=1.45
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.46,1462
+    commit=7371059e9000
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(android.library.reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.51,1512
+    commit=1.51 (2)
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.52,1520
+    commit=1.52
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.53,1535
+    commit=1bfb2b3b6297
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.60,1600
+    commit=1.60
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.61,1611
+    commit=1.61 (1)
+    subdir=ttrss-reader
+    target=android-17
+    srclibs=ActionBarSherlock@4.2.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.62,1621
+    commit=1.62 (1)
+    subdir=ttrss-reader
+    target=android-18
+    srclibs=ActionBarSherlock@4.4.0;LocaleAPI@bc2d5a1
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$LocaleAPI$$@' project.properties
+
+Build:1.7,1700
+    commit=6916241fbf87
+    subdir=ttrss-reader
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0;2:LocaleAPI@bc2d5a1
+
+Build:1.7,1701
+    commit=cb952f593b3a
+    subdir=ttrss-reader
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0;2:LocaleAPI@bc2d5a1
+
+Build:1.7,1703
+    commit=58d63e505081
+    subdir=ttrss-reader
+    target=android-19
+    srclibs=1:ActionBarSherlock@4.4.0;2:LocaleAPI@bc2d5a1
+
+Build:1.7.1,1710
+    disable=impossible to determine correct commit - even more messy than usual
+
+Maintainer Notes:
+Tags frequently get deleted and re-added pointing to somewhere else. Always use
+the tag to get the right commit, but specify the commit hash, not the tag, in
+the build data.
+
+Multiple versions of the same release (name) with different version codes and
+minor fixes in between are also common, for some reason.
+.
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.62
-Current Version Code:1621
+Update Check Mode:Tags
+Current Version:1.71
+Current Version Code:1710
 
diff --git a/metadata/org.tunesremote.txt b/metadata/org.tunesremote.txt
index 991ef50e55..1bc28a177d 100644
--- a/metadata/org.tunesremote.txt
+++ b/metadata/org.tunesremote.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:http://code.google.com/p/tunesremote-plus
-Source Code:http://code.google.com/p/tunesremote-plus/source/checkout
-Issue Tracker:http://code.google.com/p/tunesremote-plus/issues/list
+Source Code:http://code.google.com/p/tunesremote-plus/source
+Issue Tracker:http://code.google.com/p/tunesremote-plus/issues
 
 Auto Name:TunesRemote+
 Summary:DACP remote control
@@ -17,8 +17,7 @@ Build Version:2.5.2,252,141
 Build Version:2.5.3,253,154
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.5.3
 Current Version Code:253
 
diff --git a/metadata/org.uaraven.e.txt b/metadata/org.uaraven.e.txt
index 2443bfa415..047d8cc9fd 100644
--- a/metadata/org.uaraven.e.txt
+++ b/metadata/org.uaraven.e.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://android.acute-angle.net/enumbers
 Source Code:https://bitbucket.org/uaraven/enumbers/src
diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index d7915a4309..c78997c382 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:LGPLv3
 Web Site:http://www.videolan.org/vlc/download-android.html
 Source Code:http://git.videolan.org/?p=vlc-ports/android.git;a=summary
@@ -26,69 +26,117 @@ which we hope to resolve soon. BETA.
 Repo Type:git
 Repo:git://git.videolan.org/vlc-ports/android.git
 
-Build Version:0.0.11-ARMv7,110,0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
-ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
-Build Version:0.0.11-ARM,111,0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
-ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
-Build Version:0.0.11-x86,112,!ffmpeg error 0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
-ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
-Build Version:0.0.11-mips,113,0.0.11,forceversion=yes,forcevercode=yes,subdir=vlc-android,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
-prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
-ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
+Build:0.0.11-ARMv7,110
+    commit=0.0.11
+    subdir=vlc-android
+    update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock
+    forceversion=yes
+    forcevercode=yes
+    prebuild=sed -i '48d' ../Makefile
+    build=cd ../ && \
+        ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
 
-Build Version:0.1.3-MIPS,1301,!build failing (at 0.1.3),subdir=vlc-android,\
-forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
-srclibs=VLC@7c52aacbe,buildjni=no,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
-prebuild=sed -i '/ant/d' ../Makefile && \
-         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
-         ln -s vlc-android/$$VLC$$ ../vlc,\
-build=cd ../ && ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+Build:0.0.11-ARM,111
+    commit=0.0.11
+    subdir=vlc-android
+    update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock
+    forceversion=yes
+    forcevercode=yes
+    prebuild=sed -i '48d' ../Makefile
+    build=cd ../ && \
+        ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
 
-Build Version:0.1.3-x86,1302,0.1.3,subdir=vlc-android,\
-forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
-srclibs=VLC@7c52aacbe,buildjni=no,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
-prebuild=sed -i '/ant/d' ../Makefile && \
-         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
-         ln -s vlc-android/$$VLC$$ ../vlc,\
-build=cd ../ && ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+Build:0.0.11-x86,112
+    disable=ffmpeg error 0.0.11
+    commit=unknown - see disabled
+    subdir=vlc-android
+    update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock
+    forceversion=yes
+    forcevercode=yes
+    prebuild=sed -i '48d' ../Makefile
+    build=cd ../ && \
+        ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
 
-Build Version:0.1.3-ARM,1303,0.1.3,subdir=vlc-android,\
-forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
-srclibs=VLC@7c52aacbe,buildjni=no,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
-prebuild=sed -i '/ant/d' ../Makefile && \
-         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
-         ln -s vlc-android/$$VLC$$ ../vlc,\
-build=cd ../ && ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+Build:0.0.11-mips,113
+    commit=0.0.11
+    subdir=vlc-android
+    update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock
+    forceversion=yes
+    forcevercode=yes
+    prebuild=sed -i '48d' ../Makefile
+    build=cd ../ && \
+        ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
 
-Build Version:0.1.3-ARMv7,1304,0.1.3,subdir=vlc-android,\
-forceversion=yes,forcevercode=yes,patch=ndkr9.patch,\
-srclibs=VLC@7c52aacbe,buildjni=no,\
-update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;../java-libs/WheelView,\
-prebuild=sed -i '/ant/d' ../Makefile && \
-         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
-         ln -s vlc-android/$$VLC$$ ../vlc,\
-build=cd ../ && ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+Build:0.1.3-MIPS,1301
+    disable=build failing (at 0.1.3)
+    commit=0.1.3
+    subdir=vlc-android
+    forceversion=yes
+    forcevercode=yes
+    srclibs=VLC@7c52aacbe
+    patch=ndkr9.patch
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
 
-# +0: None (upstream)
-# +1: MIPS
+Build:0.1.3-x86,1302
+    commit=0.1.3
+    subdir=vlc-android
+    forceversion=yes
+    forcevercode=yes
+    srclibs=VLC@7c52aacbe
+    patch=ndkr9.patch
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
+
+Build:0.1.3-ARM,1303
+    commit=0.1.3
+    subdir=vlc-android
+    forceversion=yes
+    forcevercode=yes
+    srclibs=VLC@7c52aacbe
+    patch=ndkr9.patch
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=armeabi ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
+
+Build:0.1.3-ARMv7,1304
+    commit=0.1.3
+    subdir=vlc-android
+    forceversion=yes
+    forcevercode=yes
+    srclibs=VLC@7c52aacbe
+    patch=ndkr9.patch
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
+
+# +0: - (upstream)
+# +1: mips
 # +2: x86
-# +3: ARM
-# +4: ARMv7
-# +5: None (current version)
+# +3: arm
+# +4: armv7 (CV)
 Archive Policy:8 versions
 Auto Update Mode:None
-# Update Check Mode:Tags
-Update Check Mode:None
+Update Check Mode:Tags
+Vercode Operation:%c + 4
 Current Version:0.1.3
-Current Version Code:1305
+Current Version Code:1304
 
diff --git a/metadata/org.vono.narau.txt b/metadata/org.vono.narau.txt
index 6913957085..fe37b770cb 100644
--- a/metadata/org.vono.narau.txt
+++ b/metadata/org.vono.narau.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv3
 Web Site:https://launchpad.net/narau
 Source Code:https://code.launchpad.net/narau/fdroid
diff --git a/metadata/org.vudroid.txt b/metadata/org.vudroid.txt
index 76659fb008..ad47594b45 100644
--- a/metadata/org.vudroid.txt
+++ b/metadata/org.vudroid.txt
@@ -1,8 +1,8 @@
-Category:Reading
+Categories:Reading
 License:GPLv3
 Web Site:http://code.google.com/p/vudroid/
-Source Code:http://code.google.com/p/vudroid/source/checkout
-Issue Tracker:http://code.google.com/p/vudroid/issues/list
+Source Code:http://code.google.com/p/vudroid/source
+Issue Tracker:http://code.google.com/p/vudroid/issues
 
 Auto Name:VuDroid
 Summary:DjVu and PDF document reader
@@ -10,16 +10,26 @@ Description:
 A document reader for DjVu and PDF files.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://vudroid.googlecode.com/svn/trunk/
 
-Build Version:1.2,3,36,buildjni=yes,target=android-8
-Build Version:1.3,4,51,buildjni=yes,target=android-8
-Build Version:1.4,5,56,buildjni=yes,target=android-8
+Build:1.2,3
+    commit=36
+    target=android-8
+    buildjni=yes
+
+Build:1.3,4
+    commit=51
+    target=android-8
+    buildjni=yes
+
+Build:1.4,5
+    commit=56
+    target=android-8
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4
 Current Version Code:5
 
diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt
index a6672255b6..023ad458e1 100644
--- a/metadata/org.wahtod.wififixer.txt
+++ b/metadata/org.wahtod.wififixer.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://wififixer.wordpress.com
 Source Code:https://github.com/Zanshinmu/Wifi-Fixer
@@ -14,27 +14,98 @@ Detects and resets a broken WiFi connection.
 Repo Type:git
 Repo:https://github.com/Zanshinmu/Wifi-Fixer.git
 
-Build Version:0.7.0.3.3,620,a3c0dfd8507a7778c1a3,subdir=wififixer,target=android-8
-Build Version:0.8.0,758,d1278bb9b2cddb66a617,subdir=wififixer,target=android-8
-Build Version:0.8.0.1,759,55394716804479e76d5f,subdir=wififixer,target=android-8
-Build Version:0.8.0.2,760,ff612a31874fc89cb124,subdir=wififixer,target=android-8
-Build Version:0.8.0.3.1,770,59b8e66a0409a5d4c6a6,subdir=wififixer,target=android-8
-Build Version:0.8.0.5,822,846b5c057e886f8436eb,subdir=wififixer,target=android-8
-Build Version:0.8.0.6,838,81e9557f73d8529755cd,subdir=wififixer,target=android-8
-Build Version:0.9.0.1,915,!commit 7155ca938dc1 but can't compile for some reason
-Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififixer,target=android-15
-Build Version:0.9.5,952,4d6dda4c9aa283c162fd1d4c3edaeb8c0d6d8a32,subdir=wififixer,target=android-15
-Build Version:0.9.5.1,955,a1cd53e3d2183,subdir=wififixer,target=android-15
-Build Version:0.9.5.2,959,278b682fddca4e34416f0f49ddf33b9d6dec7819,subdir=wififixer,target=android-15
-Build Version:0.9.5.3,970,e1c737b53ebae7368b0f24c90593fe493b126edd,subdir=wififixer,target=android-15
-Build Version:0.9.5.4,978,!can't update yet: patched support jar,subdir=wififixer,target=android-15
-Build Version:0.9.5.5,980,d91f8cb77,subdir=wififixer,target=android-17
-Build Version:0.9.5.6,983,d59123b438fe,subdir=wififixer,target=android-17
-Build Version:1.0,1045,v1.0release,subdir=wififixer
-Build Version:1.0.1,1048,release_1.0.1,subdir=wififixer,gradle=yes
+Build:0.7.0.3.3,620
+    commit=a3c0dfd8507a7778c1a3
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0,758
+    commit=d1278bb9b2cddb66a617
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0.1,759
+    commit=55394716804479e76d5f
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0.2,760
+    commit=ff612a31874fc89cb124
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0.3.1,770
+    commit=59b8e66a0409a5d4c6a6
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0.5,822
+    commit=846b5c057e886f8436eb
+    subdir=wififixer
+    target=android-8
+
+Build:0.8.0.6,838
+    commit=81e9557f73d8529755cd
+    subdir=wififixer
+    target=android-8
+
+Build:0.9.0.1,915
+    disable=commit 7155ca938dc1 but can't compile for some reason
+    commit=unknown - see disabled
+
+Build:0.9.0.2,922
+    commit=b354e4538bf242f10125af49050e36126b668972
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5,952
+    commit=4d6dda4c9aa283c162fd1d4c3edaeb8c0d6d8a32
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5.1,955
+    commit=a1cd53e3d2183
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5.2,959
+    commit=278b682fddca4e34416f0f49ddf33b9d6dec7819
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5.3,970
+    commit=e1c737b53ebae7368b0f24c90593fe493b126edd
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5.4,978
+    disable=can't update yet: patched support jar
+    commit=unknown - see disabled
+    subdir=wififixer
+    target=android-15
+
+Build:0.9.5.5,980
+    commit=d91f8cb77
+    subdir=wififixer
+    target=android-17
+
+Build:0.9.5.6,983
+    commit=d59123b438fe
+    subdir=wififixer
+    target=android-17
+
+Build:1.0.1,1048
+    commit=release_1.0.1
+    subdir=wififixer
+    gradle=yes
+
+Build:1.0.2.1,1065
+    commit=v1.0.2.1
+    subdir=wififixer
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.0.1
-Current Version Code:1048
+Current Version:1.0.2.1
+Current Version Code:1065
 
diff --git a/metadata/org.webodf.txt b/metadata/org.webodf.txt
index a2b3bf92ff..36e0504938 100644
--- a/metadata/org.webodf.txt
+++ b/metadata/org.webodf.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:AGPL
 Web Site:https://gitorious.org/webodf/webodf
 Source Code:https://gitorious.org/webodf/webodf
diff --git a/metadata/org.wheelmap.android.online.txt b/metadata/org.wheelmap.android.online.txt
index ce889aa5f5..96607561cc 100644
--- a/metadata/org.wheelmap.android.online.txt
+++ b/metadata/org.wheelmap.android.online.txt
@@ -1,4 +1,5 @@
-Category:Navigation
+AntiFeatures:UpstreamNonFree
+Categories:Navigation
 License:Apache2
 Web Site:http://wheelmap.org
 Source Code:https://github.com/sozialhelden/wheelmap-android
diff --git a/metadata/org.wikipedia.wlm.txt b/metadata/org.wikilovesmonuments.txt
similarity index 52%
rename from metadata/org.wikipedia.wlm.txt
rename to metadata/org.wikilovesmonuments.txt
index 20ab41f381..84ece36b90 100644
--- a/metadata/org.wikipedia.wlm.txt
+++ b/metadata/org.wikilovesmonuments.txt
@@ -1,5 +1,4 @@
-Disabled:Service suspended
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:http://meta.wikimedia.org/wiki/Mobile_Projects
 Source Code:https://github.com/wikimedia/WLMMobile
@@ -15,15 +14,19 @@ Take pictures of monuments and enhance Wikipedia!
 Repo Type:git
 Repo:https://github.com/wikimedia/WLMMobile.git
 
-Build Version:1.2.1,7,560d13bf9c7828aed777700309a7870dec31eb63,forceversion=yes
-Build Version:1.2.2,8,v1.2.2,forceversion=yes
-Build Version:1.2.3,10,v1.2.3
-Build Version:1.2.3-1,11,v1.2.3-1
-Build Version:1.2.4,12,v1.2.4
-Build Version:1.2.5,13,v1.2.5
+# Previous app id builds
+# Build Version:1.2.1,7,560d13bf9c7828aed777700309a7870dec31eb63,forceversion=yes
+# Build Version:1.2.2,8,v1.2.2,forceversion=yes
+# Build Version:1.2.3,10,v1.2.3
+# Build Version:1.2.3-1,11,v1.2.3-1
+# Build Version:1.2.4,12,v1.2.4
+# Build Version:1.2.5,13,v1.2.5
+
+Build:1.3,13
+    commit=47ad047d2f6f1
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.2.5
+Update Check Mode:RepoManifest
+Current Version:1.3
 Current Version Code:13
 
diff --git a/metadata/org.wikimedia.commons.txt b/metadata/org.wikimedia.commons.txt
index 12bf483750..a74ef0b028 100644
--- a/metadata/org.wikimedia.commons.txt
+++ b/metadata/org.wikimedia.commons.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://meta.wikimedia.org/wiki/Wikimedia_Apps
 Source Code:https://github.com/wikimedia/apps-android-commons
diff --git a/metadata/org.wikipedia.txt b/metadata/org.wikipedia.txt
index 5353680cec..b07ed3a839 100644
--- a/metadata/org.wikipedia.txt
+++ b/metadata/org.wikipedia.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:http://meta.wikimedia.org/wiki/Mobile_Projects
 Source Code:https://github.com/wikimedia/WikipediaMobile
diff --git a/metadata/org.wiktionary.txt b/metadata/org.wiktionary.txt
index 0a0fa1ba6b..778c6e5765 100644
--- a/metadata/org.wiktionary.txt
+++ b/metadata/org.wiktionary.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPL
 Web Site:https://github.com/wikimedia/WiktionaryMobile
 Source Code:https://github.com/wikimedia/WiktionaryMobile
@@ -14,11 +14,10 @@ Client for wiktionary.org, a dictionary run by the Wikimedia project.
 Repo Type:git
 Repo:https://github.com/wikimedia/WiktionaryMobile.git
 
-Build Version:1.0.1,1,62466913087ca6,submodules=yes
+Build Version:1.0.1,1,v1.0.1release,submodules=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0.1
 Current Version Code:1
 
diff --git a/metadata/org.witness.informacam.txt b/metadata/org.witness.informacam.txt
index 9f6952ced5..c3ee8689e2 100644
--- a/metadata/org.witness.informacam.txt
+++ b/metadata/org.witness.informacam.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:https://guardianproject.info/apps/informacam
 Source Code:https://github.com/guardianproject/InformaCam
diff --git a/metadata/org.woltage.irssiconnectbot.txt b/metadata/org.woltage.irssiconnectbot.txt
index 8130853a60..171e0e3c9f 100644
--- a/metadata/org.woltage.irssiconnectbot.txt
+++ b/metadata/org.woltage.irssiconnectbot.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:https://github.com/irssiconnectbot/irssiconnectbot
 Source Code:https://github.com/irssiconnectbot/irssiconnectbot
diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt
index d1934eb5f9..6321e31e09 100644
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 # much Apache libs; assets/license.html says GPLv2: no headers or COPYING
 License:GPL
 Web Site:http://android.wordpress.org/
-Source Code:https://android.trac.wordpress.org/browser
+Source Code:https://github.com/wordpress-mobile/WordPress-Android
 Issue Tracker:http://android.trac.wordpress.org/
 
 Auto Name:WordPress
@@ -21,34 +21,108 @@ Repo:https://github.com/wordpress-mobile/WordPress-Android.git
 
 #Old svn build, untagged in git
 #Build Version:1.3.9,31,202,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8
-Build Version:1.4.1,33,1.4.1,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8
-Build Version:2.1,48,2.1,encoding=utf-8
-Build Version:2.1.1,49,2.1.1,encoding=utf-8
-Build Version:2.1.2,50,2.1.2,encoding=utf-8
-Build Version:2.1.3,52,2.1.3,encoding=utf-8
-Build Version:2.2.1,59,2.2.1,encoding=utf-8
-Build Version:2.2.2,60,2.2.2,encoding=utf-8
-Build Version:2.2.3,61,2.2.3,encoding=utf-8
-Build Version:2.2.4,62,2.2.4,encoding=utf-8
-Build Version:2.2.5,63,2.2.5,encoding=utf-8
-Build Version:2.2.7,66,2.2.7,encoding=utf-8
-Build Version:2.3,67,2.3,encoding=utf-8,\
-srclibs=ActionBarSherlock@4.2.0;MenuDrawer@2.0.2,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$MenuDrawer$$@' project.properties
-Build Version:2.4.2,74,!Does not build with any known version of MenuDrawer (at 2.4.2),encoding=utf-8,\
-srclibs=ActionBarSherlock@4.3.0;MenuDrawer3@3.0.0,prebuild=\
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$MenuDrawer3$$@' project.properties && \
-cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-echo wp.OAUTH_APP_ID="wordpress" >>local.properties && \
-echo wp.OAUTH_APP_SECRET="wordpress" >>local.properties && \
-echo wp.DB_SECRET="wordpress" >>local.properties && \
-echo wp.OAUTH_REDIRECT_URI="http://wordpress.org" >>local.properties && \
-echo wp.GCM_ID="wordpress" >>local.properties
+Build:1.4.1,33
+    commit=1.4.1
+    encoding=utf-8
+    prebuild=mkdir libs && \
+        mv *.jar libs && \
+        sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java
+
+Build:2.1,48
+    commit=2.1
+    encoding=utf-8
+
+Build:2.1.1,49
+    commit=2.1.1
+    encoding=utf-8
+
+Build:2.1.2,50
+    commit=2.1.2
+    encoding=utf-8
+
+Build:2.1.3,52
+    commit=2.1.3
+    encoding=utf-8
+
+Build:2.2.1,59
+    commit=2.2.1
+    encoding=utf-8
+
+Build:2.2.2,60
+    commit=2.2.2
+    encoding=utf-8
+
+Build:2.2.3,61
+    commit=2.2.3
+    encoding=utf-8
+
+Build:2.2.4,62
+    commit=2.2.4
+    encoding=utf-8
+
+Build:2.2.5,63
+    commit=2.2.5
+    encoding=utf-8
+
+Build:2.2.7,66
+    commit=2.2.7
+    encoding=utf-8
+
+Build:2.3,67
+    commit=2.3
+    encoding=utf-8
+    srclibs=ActionBarSherlock@4.2.0;MenuDrawer@2.0.2
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$MenuDrawer$$@' project.properties
+
+Build:2.4.2,74
+    disable=Does not build with any known version of MenuDrawer (at 2.4.2)
+    commit=2.4.2
+    encoding=utf-8
+    srclibs=ActionBarSherlock@4.3.0;MenuDrawer3@3.0.0
+    prebuild=sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+        sed -i 's@\(reference.2=\).*@\1$$MenuDrawer3$$@' project.properties && \
+        cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        echo wp.OAUTH_APP_ID="wordpress" >>local.properties && \
+        echo wp.OAUTH_APP_SECRET="wordpress" >>local.properties && \
+        echo wp.DB_SECRET="wordpress" >>local.properties && \
+        echo wp.OAUTH_REDIRECT_URI="http://wordpress.org" >>local.properties && \
+        echo wp.GCM_ID="wordpress" >>local.properties
+
+Build:2.5,83
+    commit=2.5
+    gradle=yes
+    prebuild=echo sdk.dir=$$SDK$$ >> local.properties && \
+        echo wp.OAUTH_APP_ID="wordpress" >> local.properties && \
+        echo wp.OAUTH_APP_SECRET="wordpress" >> local.properties && \
+        echo wp.DB_SECRET="wordpress" >> local.properties && \
+        echo wp.OAUTH_REDIRECT_URI="http://wordpress.org" >> local.properties && \
+        echo wp.GCM_ID="wordpress" >> local.properties
+
+Build:2.5.1,85
+    disable=Doesn't build - ApiHelper.java:368: cannot find symbol List<?>
+    commit=2.5.1
+    gradle=yes
+    prebuild=echo sdk.dir=$$SDK$$ >> local.properties && \
+        echo wp.OAUTH_APP_ID="wordpress" >> local.properties && \
+        echo wp.OAUTH_APP_SECRET="wordpress" >> local.properties && \
+        echo wp.DB_SECRET="wordpress" >> local.properties && \
+        echo wp.OAUTH_REDIRECT_URI="http://wordpress.org" >> local.properties && \
+        echo wp.GCM_ID="wordpress" >> local.properties
+
+Build:2.6 RC 1,89
+    disable=Doesn't build, see: http://sprunge.us/JhAe
+    commit=2.6-rc-1
+    gradle=yes
+    prebuild=echo sdk.dir=$$SDK$$ >> local.properties && \
+        echo wp.OAUTH_APP_ID="wordpress" >> local.properties && \
+        echo wp.OAUTH_APP_SECRET="wordpress" >> local.properties && \
+        echo wp.DB_SECRET="wordpress" >> local.properties && \
+        echo wp.OAUTH_REDIRECT_URI="http://wordpress.org" >> local.properties && \
+        echo wp.GCM_ID="wordpress" >> local.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:2.4.2
-Current Version Code:74
+Current Version:2.6 RC 1
+Current Version Code:89
 
diff --git a/metadata/org.xbmc.android.remote.txt b/metadata/org.xbmc.android.remote.txt
index c3c770c3f0..b22b7f3d12 100644
--- a/metadata/org.xbmc.android.remote.txt
+++ b/metadata/org.xbmc.android.remote.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:http://code.google.com/p/android-xbmcremote/
 Source Code:https://github.com/freezy/android-xbmcremote
-Issue Tracker:http://code.google.com/p/android-xbmcremote/issues/list
+Issue Tracker:http://code.google.com/p/android-xbmcremote/issues
 
 Auto Name:XBMC Remote
 Summary:XBMC Media Center Remote Control
@@ -17,8 +17,7 @@ Build Version:0.8.8-beta1,808,39f0204a36f72cbb705fcc89685601f55105e733,encoding=
 Build Version:1.0.9,1009,7d6c1500720b927ed202608addaa1312cf2dcbe1,encoding=utf-8,prebuild=mv lib libs && mv lib-src/org/codehaus src/org/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.9
 Current Version Code:1009
 
diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt
index 7c853b25c6..5bfc1b27b6 100644
--- a/metadata/org.xcsoar.txt
+++ b/metadata/org.xcsoar.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv2
 Web Site:http://www.xcsoar.org/
 Source Code:http://git.xcsoar.org/cgit/master/xcsoar.git/
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index 97b21009fb..e04739d9f0 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:GPLv3+
 Web Site:http://www.yaaic.org
 Source Code:http://github.com/pocmo/Yaaic/
@@ -19,11 +19,10 @@ Repo:https://github.com/pocmo/Yaaic.git
 Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
 Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
 Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
-Build Version:1.0,12,db6ed0a1224,subdir=application,update=.;../libs/ActionBarSherlock/;../libs/ViewPagerIndicator/
+Build Version:1.0,12,v1.0,subdir=application
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:12
 
diff --git a/metadata/org.yabause.android.txt b/metadata/org.yabause.android.txt
new file mode 100644
index 0000000000..d7b91f51a0
--- /dev/null
+++ b/metadata/org.yabause.android.txt
@@ -0,0 +1,34 @@
+Categories:Games
+License:GPLv2+
+Web Site:http://yabause.org
+Source Code:http://sourceforge.net/p/yabause/code/
+Issue Tracker:http://sourceforge.net/projects/yabause/support
+Donate:http://sourceforge.net/p/yabause/donate/
+
+Summary:Sega Saturn emulator
+Description:
+Yabause support booting games using Saturn cds or iso files. BIOS (optional) should be placed into 
+/sdcard/yabause/bios and games go in /sdcard/yabause/games.
+
+[http://yabause.org/compatibility-list/ Compatibility list]
+
+Status: ALPHA
+.
+
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/yabause/code/trunk/
+
+# r3136 is the last, known to work for sure
+Build Version:0.9.11,1,3136,buildjni=no,subdir=yabause/src/android,patch=toolchain.patch,\
+build=\
+ echo "APP_CFLAGS+=-Wno-error=format-security" > jni/Application.mk && \
+ export ANDROID_NDK="$$NDK$$" && cd ../.. && \
+ export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \
+ cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake \
+ -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android \
+ -DYAB_PORTS=android . && make
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:0.9.11
+Current Version Code:1
diff --git a/metadata/org.yabause.android/toolchain.patch b/metadata/org.yabause.android/toolchain.patch
new file mode 100644
index 0000000000..43eb0825e5
--- /dev/null
+++ b/metadata/org.yabause.android/toolchain.patch
@@ -0,0 +1,14 @@
+--- a/yabause/src/android/android.cmake
++++ b/yabause/src/android/android.cmake
+@@ -5,7 +5,10 @@ SET(CMAKE_C_COMPILER   arm-linux-androideabi-gcc)
+ SET(CMAKE_CXX_COMPILER arm-linux-androideabi-g++)
+ SET(CMAKE_ASM-ATT_COMPILER arm-linux-androideabi-as)
+ 
+-SET(CMAKE_FIND_ROOT_PATH /home/guillaume/projects/android/toolchain/sysroot/usr/)
++SET(CMAKE_FIND_ROOT_PATH $ENV{ANDROID_NDK}/platforms/android-8/arch-arm/usr/)
++
++set(CMAKE_C_FLAGS "--sysroot=$ENV{ANDROID_NDK}/platforms/android-8/arch-arm" CACHE STRING "GCC flags" FORCE)
++set(CMAKE_CXX_FLAGS "--sysroot=$ENV{ANDROID_NDK}/platforms/android-8/arch-arm" CACHE STRING "G++ flags" FORCE)
+ 
+ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
diff --git a/metadata/org.yaxim.androidclient.txt b/metadata/org.yaxim.androidclient.txt
index fcc5136dea..e93e513bfa 100644
--- a/metadata/org.yaxim.androidclient.txt
+++ b/metadata/org.yaxim.androidclient.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 #Not compatible with ABS and asmack
 License:GPL
 Web Site:http://yaxim.org
@@ -43,8 +43,7 @@ $$SDK$$/tools/android update project -p ActionBarSherlock/library -s -t android-
 prebuild=sed -i '4 i <string name="build_version">0.8.6b</string>' res/values/strings.xml
 
 Auto Update Mode:None
-#Tags for org.yaxim.bruno too
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:0.8.6b
 Current Version Code:16
 
diff --git a/metadata/org.yuttadhammo.BodhiTimer.txt b/metadata/org.yuttadhammo.BodhiTimer.txt
index f568737404..1e43cfcc5f 100644
--- a/metadata/org.yuttadhammo.BodhiTimer.txt
+++ b/metadata/org.yuttadhammo.BodhiTimer.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.sirimangalo.org/
 Source Code:https://github.com/yuttadhammo/BodhiTimer
@@ -13,26 +13,58 @@ An elegant minimalist count-down timer
 Repo Type:git
 Repo:https://github.com/yuttadhammo/BodhiTimer
 
-Build Version:0.8,8,0c7691a490f5e8,target=android-11
-Build Version:0.9,9,!Source code not published,target=android-11
-#0.9 not in repo so this is probably ok
-Build Version:1.0,10,e46d24a00e
-Build Version:1.3,13,a3b9743
-Build Version:1.6,16,7a892b38866508206c0a7f2325bb2d43d05a1699
-Build Version:2.1,19,4b07f45bad322670c8f963f98231a01a2e181dc2
-Build Version:2.2,20,1c04460939f3dfa6123539c361c829f7774ad5ca
-Build Version:2.3,21,d32cf50fdf273bf3a9df77ecbca9102a2deae745
-Build Version:2.4,22,f5f8b00035ad701fec660aaa51f091a29207f0aa
-Build Version:2.5,23,270a0ede351ded1928b2b5164a79b3314cef1fd3
-Build Version:2.6.1,25,aa80932ee826eca8245811db4f38d52828615366
-Build Version:2.7.3,29,358a570f7a8b5929fe138a417f9f1fac4d4b3d42
-Build Version:2.8.6,39,adb2a2c34c0c8b8fec3ecbe6937fe57d1b3533c6,init=rm -rf bin/
-Build Version:3.0,45,5cb04b8a47c35f7cf59aeca8a4aebfa5fb43b1da
+Build:0.8,8
+    commit=0c7691a490f5e8
+    target=android-11
+
+Build:0.9,9
+    disable=!Source code not published
+    commit=unknown - see disabled
+    target=android-11
+
+Build:1.0,10
+    commit=e46d24a00e
+
+Build:1.3,13
+    commit=a3b9743
+
+Build:1.6,16
+    commit=7a892b38866508206c0a7f2325bb2d43d05a1699
+
+Build:2.1,19
+    commit=4b07f45bad322670c8f963f98231a01a2e181dc2
+
+Build:2.2,20
+    commit=1c04460939f3dfa6123539c361c829f7774ad5ca
+
+Build:2.3,21
+    commit=d32cf50fdf273bf3a9df77ecbca9102a2deae745
+
+Build:2.4,22
+    commit=f5f8b00035ad701fec660aaa51f091a29207f0aa
+
+Build:2.5,23
+    commit=270a0ede351ded1928b2b5164a79b3314cef1fd3
+
+Build:2.6.1,25
+    commit=aa80932ee826eca8245811db4f38d52828615366
+
+Build:2.7.3,29
+    commit=358a570f7a8b5929fe138a417f9f1fac4d4b3d42
+
+Build:2.8.6,39
+    commit=adb2a2c34c0c8b8fec3ecbe6937fe57d1b3533c6
+    init=rm -rf bin/
+
+Build:3.0,45
+    commit=5cb04b8a47c35f7cf59aeca8a4aebfa5fb43b1da
+
+Build:3.2.2,49
+    commit=a6bc4f6b808663a
+	prebuild=echo '-dontobfuscate' > proguard-project.txt
 
 Auto Update Mode:None
-# also on gplay; don't use tags: they would be unreliable
-Update Check Mode:None
-Current Version:3.0
-Current Version Code:45
+Update Check Mode:RepoManifest
+Current Version:3.2.2
+Current Version Code:49
 
-No Source Since:3.1
diff --git a/metadata/org.yuttadhammo.tipitaka.txt b/metadata/org.yuttadhammo.tipitaka.txt
index 11bb4e7266..5fa30bd031 100644
--- a/metadata/org.yuttadhammo.tipitaka.txt
+++ b/metadata/org.yuttadhammo.tipitaka.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:http://www.sirimangalo.org/
 Source Code:https://github.com/yuttadhammo/E-Tipitaka-for-Android
@@ -14,25 +14,76 @@ import ATI English Dhamma site. There is ~15MB download required at the beginnin
 Repo Type:git
 Repo:https://github.com/yuttadhammo/E-Tipitaka-for-Android
 
-Build Version:3.3,28,8f4dd9a590d023619a,target=android-15
-Build Version:4.0,33,!Doesn't build at faf4bca2754fdb4b6a,target=android-15
-Build Version:4.3,36,!Source code not published,target=android-15
-Build Version:4.4,37,!Source code not published,target=android-15
-Build Version:4.5,38,!Source code not published,target=android-15
-Build Version:4.6,39,9e8e843,target=android-16
-Build Version:4.7,40,!no source
-Build Version:4.8,41,b9e1f060
-Build Version:4.9,42,!cannot find symbol 9eff452165
-Build Version:5.0,43,e66321d5
-Build Version:7.0,47,4a70677d9
-Build Version:8.0,49,429e206d51ac5c248edca44d45f248a8a781e38a
-Build Version:8.1,50,4459e06af6afe59b10a923f59969634e121ecb84
-Build Version:8.2,51,f4922613b7f3c355e3d86930e44f2436743ca1ae
-Build Version:8.3,52,d28806dd9f304b76f759527b53f3a5c48ff52df8
+Build:3.3,28
+    commit=8f4dd9a590d023619a
+    target=android-15
+
+Build:4.0,33
+    disable=Doesn't build at faf4bca2754fdb4b6a
+    commit=faf4bca2754fdb4b6a
+    target=android-15
+
+Build:4.3,36
+    disable=Source code not published
+    commit=unknown - see disabled
+    target=android-15
+
+Build:4.4,37
+    disable=Source code not published
+    commit=unknown - see disabled
+    target=android-15
+
+Build:4.5,38
+    disable=Source code not published
+    commit=unknown - see disabled
+    target=android-15
+
+Build:4.6,39
+    commit=9e8e843
+    target=android-16
+
+Build:4.7,40
+    disable=no source
+    commit=unknown - see disabled
+
+Build:4.8,41
+    commit=b9e1f060
+
+Build:4.9,42
+    disable=cannot find symbol 9eff452165
+    commit=unknown - see disabled
+
+Build:5.0,43
+    commit=e66321d5
+
+Build:7.0,47
+    commit=4a70677d9
+
+Build:8.0,49
+    commit=429e206d51ac5c248edca44d45f248a8a781e38a
+
+Build:8.1,50
+    commit=4459e06af6afe59b10a923f59969634e121ecb84
+
+Build:8.2,51
+    commit=f4922613b7f3c355e3d86930e44f2436743ca1ae
+
+Build:8.3,52
+    commit=d28806dd9f304b76f759527b53f3a5c48ff52df8
+
+Build:9.1.1,56
+    commit=155be40b37b686bb
+	srclibs=SlidingMenu@7ebe3277241;ActionBarSherlock@4.4.0
+	extlibs=android/android-support-v4.jar
+	prebuild=\
+		sed -i project.properties \
+			-e 's@\(reference.1=\).*@reference.1=$$SlidingMenu$$@' \
+			-e 's@\(reference.2=\).*@reference.2=$$ActionBarSherlock$$@' && \
+		cp libs/android-support-v4.jar $$SlidingMenu$$/libs && \
+		cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:8.3
-Current Version Code:52
+Update Check Mode:RepoManifest
+Current Version:9.1.1
+Current Version Code:56
 
diff --git a/metadata/org.zakky.memopad.txt b/metadata/org.zakky.memopad.txt
index 34be2f9358..a534d8245a 100644
--- a/metadata/org.zakky.memopad.txt
+++ b/metadata/org.zakky.memopad.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://github.com/zaki50/MemoPad
 Source Code:https://github.com/zaki50/MemoPad
diff --git a/metadata/org.zeitgeist.movement.txt b/metadata/org.zeitgeist.movement.txt
index 1144ec58f0..00150f0f4e 100644
--- a/metadata/org.zeitgeist.movement.txt
+++ b/metadata/org.zeitgeist.movement.txt
@@ -1,6 +1,6 @@
 #NonFreeDep may be removed by applying the patch below
 AntiFeatures:NonFreeDep
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://www.thezeitgeistmovement.com
 Source Code:http://tzm-android.svn.sourceforge.net/viewvc/tzm-android/
@@ -25,7 +25,7 @@ installed either as an app or as a shared system library for this app to be
 installable. We will be able to remove this dependency soon.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:https://tzm-android.svn.sourceforge.net/svnroot/tzm-android/TZM-Android
 
 Build Version:1.2.3,24,303
@@ -38,8 +38,7 @@ Build Version:1.2.4,25,316
 #prebuild=sed -i '/maps/d' AndroidManifest.xml
 
 Auto Update Mode:None
-# also on gplay
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.2.4
 Current Version Code:25
 
diff --git a/metadata/org.zephyrsoft.checknetwork.txt b/metadata/org.zephyrsoft.checknetwork.txt
new file mode 100644
index 0000000000..1d7eb6dcd4
--- /dev/null
+++ b/metadata/org.zephyrsoft.checknetwork.txt
@@ -0,0 +1,40 @@
+AntiFeatures:Tracking
+Categories:Internet
+License:GPLv3
+Web Site:https://dev.zephyrsoft.org
+Source Code:https://dev.zephyrsoft.org/svn/projects/checknetwork/trunk
+Issue Tracker:
+
+Auto Name:Check Network
+Summary:Auto connect to network
+Description:
+Due to changes to APN privileges in Android 4.0.4 this will only work as a system app.
+
+Periodically checks the internet connection and reconnects if the internet
+can't be reached.
+Every check downloads 5KB from google.com.
+
+Tracking: Crash reports are sent without interaction.
+.
+
+Repo Type:git-svn
+Repo:https://dev.zephyrsoft.org/svn/projects/checknetwork;trunk=trunk;tags=tags
+
+Build:1.2,3
+    commit=193
+    forceversion=yes
+    forcevercode=yes
+    prebuild=echo -e 'java.source=1.6\njava.target=1.6' > ant.properties
+
+Build:0.1.3,4
+    disable=not a release yet
+
+Maintainer Notes:
+Bumps just after release
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.1.3-SNAPSHOT
+Current Version Code:4
+
diff --git a/metadata/org.zephyrsoft.trackworktime.txt b/metadata/org.zephyrsoft.trackworktime.txt
new file mode 100644
index 0000000000..8a9704f5fd
--- /dev/null
+++ b/metadata/org.zephyrsoft.trackworktime.txt
@@ -0,0 +1,44 @@
+AntiFeatures:Tracking
+Categories:Office
+License:GPLv3
+Web Site:https://dev.zephyrsoft.org
+Source Code:https://dev.zephyrsoft.org/svn/projects/trackworktime/trunk
+Issue Tracker:https://dev.zephyrsoft.org/jira/browse/TWT
+
+Auto Name:Track Work Time
+Summary:Track your work time
+Description:
+It lets you categorize each recorded interval by a client/task and a free text. 
+The list of clients/tasks can be edited to suit your needs.
+
+Additionally, if you wish, your flexible time account is taken care of: 
+you always see how much you worked. 
+You can also keep an eye on how much work time is left for today (by a 
+notification which you can enable).
+
+You may provide the geo-coordinates of your work place and the app can 
+automatically clock you in while you are at work. 
+This is done without using GPS, so your battery won’t be emptied by this app.
+
+Anti-feature: Tracking. Crash reports are sent without interaction.
+.
+
+Repo Type:git-svn
+Repo:https://dev.zephyrsoft.org/svn/projects/trackworktime;trunk=trunk;tags=tags
+
+Build:0.5.11,14
+    commit=476
+    forceversion=yes
+
+Build:0.5.12,15
+    disable=not a release yet
+
+Maintainer Notes:
+Bumps just after release
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.5.12-SNAPSHOT
+Current Version Code:15
+
diff --git a/metadata/org.zeroxlab.zeroxbenchmark.txt b/metadata/org.zeroxlab.zeroxbenchmark.txt
index fdfc0fd4d9..1bcbd6ca5a 100644
--- a/metadata/org.zeroxlab.zeroxbenchmark.txt
+++ b/metadata/org.zeroxlab.zeroxbenchmark.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/0xbench/
 Source Code:https://gitorious.org/0xbench/0xbench
-Issue Tracker:http://code.google.com/p/0xbench/issues/list
+Issue Tracker:http://code.google.com/p/0xbench/issues
 
 Auto Name:0xBenchmark
 Summary:System benchmark
diff --git a/metadata/org.zirco.txt b/metadata/org.zirco.txt
index 0a8c734601..de402616bf 100644
--- a/metadata/org.zirco.txt
+++ b/metadata/org.zirco.txt
@@ -1,39 +1,57 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:http://code.google.com/p/zirco-browser
-Source Code:http://code.google.com/p/zirco-browser/source/checkout
-Issue Tracker:http://code.google.com/p/zirco-browser/issues/list
+Source Code:http://code.google.com/p/zirco-browser/source
+Issue Tracker:http://code.google.com/p/zirco-browser/issues
 
 Auto Name:Zirco Browser
 Summary:Web browser with ad blocker
 Description:
-If you are using Android 4.0+, you should try [[org.tint]] instead.
-
 A web browser featuring:
-*Basic browser features (bookmarks, history, downloads...);
-*Unlimited tabs;
-*Easy bookmarks access;
-*Easy tabs opening and closing;
-*Bookmarks import from legacy Android browser;
-*Can be set as default browser;
-*Ad-blocker
+* Basic browser features (bookmarks, history, downloads...);
+* Unlimited tabs;
+* Easy bookmarks access;
+* Easy tabs opening and closing;
+* Bookmarks import from legacy Android browser;
+* Can be set as default browser;
+* Ad-blocker
+
+Similar apps:
+* [[org.tint]] (Android 4.0+)
 .
 
 Repo Type:git-svn
-Repo:http://zirco-browser.googlecode.com/svn/trunk
+Repo:http://zirco-browser.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:0.3.6,10,315
-Build Version:0.3.7,11,329
-Build Version:0.3.8,12,339
-Build Version:0.3.9,13,367
-Build Version:0.4.1,15,407
-Build Version:0.4.2,16,438,target=android-10
-Build Version:0.4.3,17,443,target=android-10
-Build Version:0.4.4,18,464,target=android-10
+Build:0.3.6,10
+    commit=315
+
+Build:0.3.7,11
+    commit=329
+
+Build:0.3.8,12
+    commit=339
+
+Build:0.3.9,13
+    commit=367
+
+Build:0.4.1,15
+    commit=407
+
+Build:0.4.2,16
+    commit=438
+    target=android-10
+
+Build:0.4.3,17
+    commit=443
+    target=android-10
+
+Build:0.4.4,18
+    commit=0.4.4
+    target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.4.4
 Current Version Code:18
 
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
index dc47f5f981..7ae7984fff 100644
--- a/metadata/paulscode.android.mupen64plusae.txt
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:http://www.paulscode.com/forum/index.php?topic=96
 Source Code:https://github.com/paulscode/mupen64plus-ae
@@ -19,7 +19,8 @@ Getting started:
 * Browse to them from within the app
 * ROMs must be in .n64, .v64, or .z64 format, optionally in .zip files
 
-A library to support the Ouya games console was removed before building.
+A proprietary library to support the Ouya games console was removed before
+building.
 
 [https://github.com/paulscode/mupen64plus-ae/raw/master/assets/changelog.txt Changelog]
 .
@@ -27,18 +28,35 @@ A library to support the Ouya games console was removed before building.
 Repo Type:git
 Repo:https://github.com/paulscode/mupen64plus-ae.git
 
-Build Version:2.0.0,16,2.0.0,rm=libs/ouya-sdk.jar,buildjni=yes
-Build Version:2.1.1,21,2.1.1,rm=libs/ouya-sdk.jar,buildjni=yes
-Build Version:2.1.3,23,2.1.3,rm=libs/ouya-sdk.jar,buildjni=yes
-Build Version:2.3.2,28,!build error with ndk-r9 at 2.3.2,\
-rm=libs/ouya-sdk.jar;libs/com.bda.controller.jar,\
-buildjni=yes
+Build:2.0.0,16
+    commit=2.0.0
+    rm=libs/ouya-sdk.jar
+    buildjni=yes
 
+Build:2.1.1,21
+    commit=2.1.1
+    rm=libs/ouya-sdk.jar
+    buildjni=yes
+
+Build:2.1.3,23
+    commit=2.1.3
+    rm=libs/ouya-sdk.jar
+    buildjni=yes
+
+Build:2.4.3,353
+    disable=https://github.com/paulscode/mupen64plus-ae/issues/342
+    commit=2.4.3
+    rm=libs/ouya-sdk.jar;libs/ouya-sdk.jar.properties
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk
+    buildjni=yes
+
+# +0: - (upstream)
+# +1: x86
+# +2: arm
+# +3: armv7 (CV)
 Auto Update Mode:None
-# In market under different name
-# versions have a (debug) string merely to distinguish bug reports (can remove)
-# Problem fetching tags with older versions of git
-Update Check Mode:None
-Current Version:2.3.2
-Current Version Code:28
+Update Check Mode:Tags
+Vercode Operation:%c*10 + 3
+Current Version:2.4.3
+Current Version Code:353
 
diff --git a/metadata/pe.moe.nori.txt b/metadata/pe.moe.nori.txt
new file mode 100644
index 0000000000..111227fa34
--- /dev/null
+++ b/metadata/pe.moe.nori.txt
@@ -0,0 +1,38 @@
+Categories:Multimedia
+License:ISC
+Web Site:
+Source Code:https://github.com/vomitcuddle/nori
+Issue Tracker:https://github.com/vomitcuddle/nori/issues
+
+Auto Name:Nori
+Summary:Online gallery viewer
+Description:
+Connect to Danbooru image galleries and browse by
+tags (A swipe from the side reveals the action bar).
+
+The safebooru.org site is preloaded which shows Anime images
+that are considered 'safe for work'. Note that the images there are usually
+of high quality and though the app is fast, a lot of data 
+will be downloaded.
+.
+
+Repo Type:git
+Repo:https://github.com/vomitcuddle/nori.git
+
+Build:1.1.1,6
+    commit=v1.1.2
+    srclibs=2:ActionBarSherlock@4.4.0;1:Volley@android-4.4_r1.2
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Build:1.1.5,10
+    disable=not published
+    commit=081118c3136
+    rm=libs/libGoogleAnalyticsV2.jar
+    srclibs=2:ActionBarSherlock@4.4.0;1:Volley@android-4.4_r1.2;3:NoAnalytics@c8d7785075
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1.1
+Current Version Code:6
+
diff --git a/metadata/pl.magot.vetch.ancal.txt b/metadata/pl.magot.vetch.ancal.txt
index 0d38833855..2d6a79a387 100644
--- a/metadata/pl.magot.vetch.ancal.txt
+++ b/metadata/pl.magot.vetch.ancal.txt
@@ -2,8 +2,8 @@ Disabled:2.5+ years of inactivity, better offline calendars available
 Category:Office
 License:MIT
 Web Site:http://code.google.com/p/ancal/
-Source Code:http://code.google.com/p/ancal/source/checkout
-Issue Tracker:http://code.google.com/p/ancal/issues/list
+Source Code:http://code.google.com/p/ancal/source
+Issue Tracker:http://code.google.com/p/ancal/issues
 
 Auto Name:AnCal
 Summary:Calendar
@@ -13,7 +13,7 @@ in a while so your mileage may vary. There is a fork of this called Offline
 Calendar that has some usability improvements.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://ancal.googlecode.com/svn/trunk/
 
 Build Version:1.6,32,23,fixtrans=yes
diff --git a/metadata/pl.nkg.geokrety.txt b/metadata/pl.nkg.geokrety.txt
new file mode 100644
index 0000000000..d4e0c9efc8
--- /dev/null
+++ b/metadata/pl.nkg.geokrety.txt
@@ -0,0 +1,36 @@
+Categories:Navigation
+License:GPLv3
+Web Site:http://geokrety.org
+Source Code:http://sourceforge.net/p/geokretylog/code
+Issue Tracker:http://forum.opencaching.pl/viewtopic.php?f=6&t=7789
+
+Auto Name:GeoKrety Logger
+Summary:Geocaching client
+Description:
+GeoKrety is a non-commercial GeoCaching game.
+People move registered objects (called GeoKrety) from cache to cache and 
+register each move with the service. 
+For more information please visit the website.
+You'll need account on the website to use the app.
+
+How to log GeoKret's movement:
+# Click the button "Log GeoKret" on the main screen.
+# Select the type of the log. Make sure that in the "Identify GeoKret" is your login.
+# If you had met or grabbed the GeoKret, fill in it's tracking code. If you drop the GeoKret, you can click "Inventory" and choose Tracking Code from the list of GeoKrets in your inventory.
+# If you had dropped or met GeoKret, you have to fill in the Waypoint. If you had logged to the cache before, click the button "OC Log" and select waypoint from the list (the date and time will be pasted too).
+# Set date and time, enter some comments and click "Go!".
+
+Status: Beta
+.
+
+Repo Type:git-svn
+Repo:svn://svn.code.sf.net/p/geokretylog/code;trunk=trunk;tags=tags
+
+Build:0.4.2 beta,12
+    commit=release-0.4.2-beta
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.4.2 beta
+Current Version Code:12
+
diff --git a/metadata/priv.twoerner.brightnesswidget.txt b/metadata/priv.twoerner.brightnesswidget.txt
new file mode 100644
index 0000000000..bac4587306
--- /dev/null
+++ b/metadata/priv.twoerner.brightnesswidget.txt
@@ -0,0 +1,24 @@
+Categories:System
+License:MIT
+Web Site:
+Source Code:https://github.com/tillwoerner/BrightnessWidget
+Issue Tracker:https://github.com/tillwoerner/BrightnessWidget/issues
+
+Auto Name:Brightness Widget
+Summary:Brightness widget
+Description:
+Configurable brightness widget.
+.
+
+Repo Type:git
+Repo:https://github.com/tillwoerner/BrightnessWidget.git
+
+Build:1.6,7
+    commit=Version_1.6
+    prebuild=sed -i '/reference/d' project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.6
+Current Version Code:7
+
diff --git a/metadata/pro.dbro.bart.txt b/metadata/pro.dbro.bart.txt
index 723a43e96d..81e2acf47d 100644
--- a/metadata/pro.dbro.bart.txt
+++ b/metadata/pro.dbro.bart.txt
@@ -1,4 +1,4 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:
 Source Code:https://github.com/OnlyInAmerica/BART
diff --git a/metadata/pro.oneredpixel.l9droid.txt b/metadata/pro.oneredpixel.l9droid.txt
new file mode 100644
index 0000000000..0ad7428971
--- /dev/null
+++ b/metadata/pro.oneredpixel.l9droid.txt
@@ -0,0 +1,24 @@
+Categories:Games
+License:GPLv2
+Web Site:http://oneredpixel.pro
+Source Code:https://github.com/tsapree/L9Droid
+Issue Tracker:https://github.com/tsapree/L9Droid/issues
+
+Auto Name:L9Droid
+Summary:Interactive fiction
+Description:
+Download and play games in the Level9 format, including Spectrum
+snapshots.
+.
+
+Repo Type:git
+Repo:https://github.com/tsapree/L9Droid.git
+
+Build:0.5,3
+    commit=c5a61
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.5
+Current Version Code:3
+
diff --git a/metadata/pt.isec.tp.am.txt b/metadata/pt.isec.tp.am.txt
index ec9da2149a..79519d4f1c 100644
--- a/metadata/pt.isec.tp.am.txt
+++ b/metadata/pt.isec.tp.am.txt
@@ -1,4 +1,4 @@
-Category:Games
+Categories:Games
 License:GPLv3
 Web Site:https://gitorious.org/free-fall/free-fall
 Source Code:https://gitorious.org/free-fall/free-fall
diff --git a/metadata/remuco.client.android.txt b/metadata/remuco.client.android.txt
index adbcebd571..e8fc79993c 100644
--- a/metadata/remuco.client.android.txt
+++ b/metadata/remuco.client.android.txt
@@ -1,7 +1,7 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv3
 Web Site:https://code.google.com/p/remuco/
-Source Code:https://code.google.com/p/remuco/source/browse/
+Source Code:https://code.google.com/p/remuco/source
 Issue Tracker:https://code.google.com/p/remuco/wiki/Issues?tm=3
 FlattrID:141543
 
diff --git a/metadata/ro.ieval.fonbot.txt b/metadata/ro.ieval.fonbot.txt
index 96805dfed4..db8ce64c79 100644
--- a/metadata/ro.ieval.fonbot.txt
+++ b/metadata/ro.ieval.fonbot.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:
 Source Code:http://git.ieval.ro/?p=fonbot.git
diff --git a/metadata/ro.ui.pttdroid.txt b/metadata/ro.ui.pttdroid.txt
index 1e30527363..28c565a651 100644
--- a/metadata/ro.ui.pttdroid.txt
+++ b/metadata/ro.ui.pttdroid.txt
@@ -1,8 +1,8 @@
-Category:Phone & SMS
+Categories:Phone & SMS
 License:GPLv3
 Web Site:https://code.google.com/p/pttdroid/
-Source Code:https://code.google.com/p/pttdroid/source/list
-Issue Tracker:https://code.google.com/p/pttdroid/issues/list
+Source Code:https://code.google.com/p/pttdroid/source
+Issue Tracker:https://code.google.com/p/pttdroid/issues
 
 Auto Name:pttdroid
 Summary:Walkie Talkie/Push to Talk
@@ -13,15 +13,28 @@ works on GSM. Uses Speex (http://www.speex.org/) for voice encoding which can be
 .
 
 Repo Type:git-svn
-Repo:http://pttdroid.googlecode.com/svn;trunk=trunk;tags=tags
+Repo:http://pttdroid.googlecode.com/svn;trunk=trunk/pttdroid;tags=tags
 
-Build Version:1.1,2,1.1,buildjni=yes,prebuild=rm -rf libs/,target=android-7
-Build Version:1.2,3,62,buildjni=yes,subdir=pttdroid,prebuild=rm -rf libs/
+Build:1.1,2
+    commit=1.1
+    target=android-7
+    prebuild=rm -rf libs/
+    buildjni=yes
+
+Build:1.2,3
+    commit=62
+    prebuild=rm -rf libs/
+    buildjni=yes
+
+Build:1.5,4
+    commit=71
+    forceversion=yes
+    prebuild=rm -rf libs/
+    target=android-18
+    buildjni=yes
 
 Auto Update Mode:None
-# Can't use Tags, since trunk uses subdir while tags doesn't
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1
-Current Version Code:2
+Update Check Mode:RepoManifest
+Current Version:1.5.1
+Current Version Code:4
 
diff --git a/metadata/ro.weednet.contactssync.txt b/metadata/ro.weednet.contactssync.txt
index 1e34d4ae5b..2b8bf9528e 100644
--- a/metadata/ro.weednet.contactssync.txt
+++ b/metadata/ro.weednet.contactssync.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:
 Source Code:https://github.com/loadrunner/Facebook-Contact-Sync
diff --git a/metadata/ru.gelin.android.sendtosd.txt b/metadata/ru.gelin.android.sendtosd.txt
index a3316259b9..a59ba9f44a 100644
--- a/metadata/ru.gelin.android.sendtosd.txt
+++ b/metadata/ru.gelin.android.sendtosd.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/sendtosd-android
-Source Code:http://code.google.com/p/sendtosd-android/source/checkout
-Issue Tracker:http://code.google.com/p/sendtosd-android/issues/list
+Source Code:http://code.google.com/p/sendtosd-android/source
+Issue Tracker:http://code.google.com/p/sendtosd-android/issues
 
 Auto Name:Send to SD card
 Summary:Copy things to the local storage
@@ -22,8 +22,7 @@ Build Version:0.3.9,36,30c17f33485d,target=android-14,prebuild=\
 sed -i 's/android:targetSdkVersion="11"/android:targetSdkVersion="14"/g' AndroidManifest.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.3.9
 Current Version Code:36
 
diff --git a/metadata/ru.gelin.android.weather.notification.skin.blacktext.txt b/metadata/ru.gelin.android.weather.notification.skin.blacktext.txt
index fea0504fb5..8c9174bc1d 100644
--- a/metadata/ru.gelin.android.weather.notification.skin.blacktext.txt
+++ b/metadata/ru.gelin.android.weather.notification.skin.blacktext.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:https://code.google.com/p/weather-notification-android/
-Source Code:https://code.google.com/p/weather-notification-android/source/browse/
-Issue Tracker:https://code.google.com/p/weather-notification-android/issues/list
+Source Code:https://code.google.com/p/weather-notification-android/source
+Issue Tracker:https://code.google.com/p/weather-notification-android/issues
 
 Name:Weather Skin: Black
 Auto Name:Weather notification skin: black text
@@ -11,17 +11,20 @@ Description:
 Black skin for [[ru.gelin.android.weather.notification]].
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/weather-notification-android/
+Repo Type:srclib
+Repo:WeatherNotification
 
 Build Version:0.3-beta1,9,a717e37fca61,subdir=skins/black-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
 Build Version:0.3,11,b4f537a97fe7,subdir=skins/black-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
 Build Version:0.3.1,12,30d71fd307ae,subdir=skins/black-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
-Build Version:0.3.3,14,a0c2e640e60a,subdir=skins/black-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15,forcevercode=yes,forceversion=yes
+
+Build:0.3.3,14
+	commit=v.0.3.3
+	subdir=skins/black-text
+	target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.3.3
 Current Version Code:14
 
diff --git a/metadata/ru.gelin.android.weather.notification.skin.whitetext.txt b/metadata/ru.gelin.android.weather.notification.skin.whitetext.txt
index 5a2fe803a0..cd712ec3ae 100644
--- a/metadata/ru.gelin.android.weather.notification.skin.whitetext.txt
+++ b/metadata/ru.gelin.android.weather.notification.skin.whitetext.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:https://code.google.com/p/weather-notification-android/
-Source Code:https://code.google.com/p/weather-notification-android/source/browse/
-Issue Tracker:https://code.google.com/p/weather-notification-android/issues/list
+Source Code:https://code.google.com/p/weather-notification-android/source
+Issue Tracker:https://code.google.com/p/weather-notification-android/issues
 
 Name:Weather Skin: White
 Auto Name:Weather notification skin: white text
@@ -11,17 +11,16 @@ Description:
 White skin for [[ru.gelin.android.weather.notification]].
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/weather-notification-android/
+Repo Type:srclib
+Repo:WeatherNotification
 
 Build Version:0.3-beta1,9,a717e37fca61,subdir=skins/white-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
 Build Version:0.3,11,b4f537a97fe7,subdir=skins/white-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
 Build Version:0.3.1,12,30d71fd307ae,subdir=skins/white-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15
-Build Version:0.3.3,14,a0c2e640e60a,subdir=skins/white-text,update=.;../../libs/libpreference;../../libs/libweather;../../libs/libweatherskin,target=android-15,forcevercode=yes,forceversion=yes
+Build Version:0.3.3,14,a0c2e640e60a,subdir=skins/white-text,target=android-15,forcevercode=yes,forceversion=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.3.3
 Current Version Code:14
 
diff --git a/metadata/ru.gelin.android.weather.notification.txt b/metadata/ru.gelin.android.weather.notification.txt
index e08c9c9dc3..6e82fd950a 100644
--- a/metadata/ru.gelin.android.weather.notification.txt
+++ b/metadata/ru.gelin.android.weather.notification.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv2
 Web Site:https://code.google.com/p/weather-notification-android/
-Source Code:https://code.google.com/p/weather-notification-android/source/browse/
-Issue Tracker:https://code.google.com/p/weather-notification-android/issues/list
+Source Code:https://code.google.com/p/weather-notification-android/source
+Issue Tracker:https://code.google.com/p/weather-notification-android/issues
 
 Auto Name:Weather notification
 Summary:Weather info in notification bar
@@ -18,8 +18,8 @@ Install the skins for a different look - see
 This app uses the [http://openweathermap.org/ openweathermap] API.
 .
 
-Repo Type:hg
-Repo:https://code.google.com/p/weather-notification-android/
+Repo Type:srclib
+Repo:WeatherNotification
 
 Build Version:0.2-beta2,23,253d9dc3022a,target=android-4
 Build Version:0.3-beta1,26,5c5bafecb2cc,update=.;libs/libpreference;libs/libweather;libs/libweatherskin,target=android-15
@@ -27,12 +27,10 @@ Build Version:0.3-beta3,28,6391db2d5149,update=.;libs/libpreference;libs/libweat
 Build Version:0.3-beta4,29,150a4999604b,update=.;libs/libpreference;libs/libweather;libs/libweatherskin,target=android-15
 Build Version:0.3,30,b4f537a97fe7,update=.;libs/libpreference;libs/libweather;libs/libweatherskin,target=android-15
 Build Version:0.3.1,32,30d71fd307ae,update=.;libs/libpreference;libs/libweather;libs/libweatherskin,target=android-15
-Build Version:0.3.3,39,a0c2e640e60a,update=.;../libs/libpreference;../libs/libweather;../libs/libweatherskin,target=android-15,subdir=core,init=rm -rf ../bin
-Build Version:0.3.4,41,!no tag and correct commit unclear
+Build Version:0.3.3,39,a0c2e640e60a,target=android-15,subdir=core,init=rm -rf ../bin
 
 Auto Update Mode:None
-# uses tags; downloads page; also on gplay
-Update Check Mode:None
-Current Version:0.3.4
-Current Version Code:41
+Update Check Mode:Tags
+Current Version:0.3.3
+Current Version Code:39
 
diff --git a/metadata/ru.glesik.nostrangersms.txt b/metadata/ru.glesik.nostrangersms.txt
index 8231a30648..3bb5ee1592 100644
--- a/metadata/ru.glesik.nostrangersms.txt
+++ b/metadata/ru.glesik.nostrangersms.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:https://github.com/glesik/nostrangersms
 Source Code:https://github.com/glesik/nostrangersms
@@ -21,10 +21,17 @@ Features include:
 Repo Type:git
 Repo:https://github.com/glesik/nostrangersms.git
 
-Build Version:1.2,120,v1.2
+Build:1.2,120
+    commit=v1.2
 
-Auto Update Mode:None
+Build:1.4,140
+    commit=v1.4
+
+Build:1.4.1,141
+    commit=v1.4.1
+
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:120
+Current Version:1.4.1
+Current Version Code:141
 
diff --git a/metadata/ru.neverdark.silentnight.txt b/metadata/ru.neverdark.silentnight.txt
new file mode 100644
index 0000000000..6f18610bd7
--- /dev/null
+++ b/metadata/ru.neverdark.silentnight.txt
@@ -0,0 +1,22 @@
+Categories:Office
+License:GPLv3
+Source Code:https://github.com/yankovskiy/SilentNight
+Issue Tracker:https://github.com/yankovskiy/SilentNight/issues
+
+Summary:Tell the phone to mute
+Description:
+Configure the phone to go silent and/or airplane mode
+between two times of the day.
+.
+
+Repo Type:git
+Repo:https://github.com/yankovskiy/SilentNight.git
+
+Build:0.1.5,6
+    commit=v0.1.5
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1.5
+Current Version Code:6
+
diff --git a/metadata/ru.o2genum.coregame.txt b/metadata/ru.o2genum.coregame.txt
new file mode 100644
index 0000000000..efe6ed6284
--- /dev/null
+++ b/metadata/ru.o2genum.coregame.txt
@@ -0,0 +1,25 @@
+Categories:Games
+License:MIT
+Web Site:https://github.com/o2genum/CoreGame
+Source Code:https://github.com/o2genum/CoreGame
+Issue Tracker:https://github.com/o2genum/CoreGame/issues
+
+Auto Name:Core
+Summary:Simple game
+Description:
+The rules are simple:
+* protect the core (big cyan dot in the center of the screen) as long as possible
+* gain health (cyan dots) and use shields (blue dots)
+.
+
+Repo Type:git
+Repo:https://github.com/o2genum/CoreGame.git
+
+#Tag is present for 1.0, but points to wrong place
+Build Version:1.0,3,421a199,rm=CoreGame.apk
+
+Auto Update Mode:None
+Update Check Mode:Static
+Current Version:1.0
+Current Version Code:3
+
diff --git a/metadata/ru.orangesoftware.financisto.txt b/metadata/ru.orangesoftware.financisto.txt
index d00a48a33c..d36a690b79 100644
--- a/metadata/ru.orangesoftware.financisto.txt
+++ b/metadata/ru.orangesoftware.financisto.txt
@@ -1,6 +1,6 @@
 #Stats sent by default
 AntiFeatures:Tracking
-Category:Office
+Categories:Office
 License:GPL
 Web Site:http://financisto.com/
 Source Code:http://bazaar.launchpad.net/~financisto-dev/financisto/trunk/files
@@ -24,13 +24,10 @@ Personal finance manager
 Repo Type:bzr
 Repo:lp:financisto
 
-Auto Update Mode:None
-# Build fails, wrong path to GreenDroid library
-#Build Version:1.5.4,57,303,target=android-4
 #Unidentified GDocsAPI.jar ; uses Google APIs to build
 #Build Version:1.6.1,79,426
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.6.4
-Current Version Code:82
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.6.5u1
+Current Version Code:85
 
diff --git a/metadata/ru.qrck.quitetaskmanager.txt b/metadata/ru.qrck.quitetaskmanager.txt
index aed139870d..7691183614 100644
--- a/metadata/ru.qrck.quitetaskmanager.txt
+++ b/metadata/ru.qrck.quitetaskmanager.txt
@@ -2,8 +2,8 @@ Disabled:pre-alpha abandonware
 Category:System
 License:GPLv3
 Web Site:http://code.google.com/p/quitetaskmanager/
-Source Code:http://code.google.com/p/quitetaskmanager/source/checkout
-Issue Tracker:http://code.google.com/p/quitetaskmanager/issues/list
+Source Code:http://code.google.com/p/quitetaskmanager/source
+Issue Tracker:http://code.google.com/p/quitetaskmanager/issues
 
 Auto Name:QuiteTaskManager
 Summary:Lightweight task manager
diff --git a/metadata/ru.ttyh.neko259.notey.txt b/metadata/ru.ttyh.neko259.notey.txt
index 819e69f5fe..0a2aed06f7 100644
--- a/metadata/ru.ttyh.neko259.notey.txt
+++ b/metadata/ru.ttyh.neko259.notey.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:NewBSD
 Web Site:https://bitbucket.org/neko259/notey
 Source Code:https://bitbucket.org/neko259/notey/src
diff --git a/metadata/ru.valle.btc.txt b/metadata/ru.valle.btc.txt
new file mode 100644
index 0000000000..8438712a28
--- /dev/null
+++ b/metadata/ru.valle.btc.txt
@@ -0,0 +1,50 @@
+Categories:Office
+License:MIT
+Web Site:
+Source Code:https://github.com/ValleZ/Paper-Wallet
+Issue Tracker:https://github.com/ValleZ/Paper-Wallet/issues
+
+Auto Name:Paper Wallet
+Summary:Back up bitcoins
+Description:
+Generates a bitcoin address and corresponding private key in 'mini' format. 
+Write down the private key and address then send bitcoins to that address.
+You can securely and OFFLINE SPEND coins from your paper wallet 
+without revealing your private key.
+Full instructions within.
+
+Check your balance via blockchain.info.
+.
+
+Repo Type:git
+Repo:https://github.com/ValleZ/Paper-Wallet.git
+
+Build:1.7.0,170
+    commit=9961fe3be909e
+    target=android-16
+
+Build:1.9.0,190
+    commit=ec6970073cf2
+    init=zip -r native.zip libs/armeabi* libs/x86
+    target=android-16
+    build=unzip native.zip
+
+Maintainer Notes:
+zbar libraries are from official binaries on sourceforge. I tried to compile from
+http://github.com/ZBar/ZBar but was unsuccessful. See trikita.obsqr though.
+.
+
+Build:2.0.1,201
+    commit=143a5867858
+    target=android-19
+
+Maintainer Notes:
+The zbar library comes from https://github.com/ZBar/ZBar. We could compile it
+and make it available as an extlib. See also https://github.com/ValleZ/Paper-Wallet/issues/1
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:2.0.1
+Current Version Code:201
+
diff --git a/metadata/ru0xdc.rtkgps.txt b/metadata/ru0xdc.rtkgps.txt
new file mode 100644
index 0000000000..2a99f0b23a
--- /dev/null
+++ b/metadata/ru0xdc.rtkgps.txt
@@ -0,0 +1,42 @@
+Categories:Navigation
+License:MIT
+Source Code:https://github.com/illarionov/RtkGps
+Issue Tracker:https://github.com/illarionov/RtkGps/issues
+
+Summary:RTKLIB rtknavi port
+Description:
+Real-time standard and precise GNSS Positioning on Android using an external 
+Bluetooth or USB GPS receiver; based on RTKLIB.
+
+* GPS, GLONASS, Galileo, QZSS, BeiDou and SBAS Navigation systems
+* Single, DGPS/DGNSS, Kinematic, Static, Moving-Baseline, Fixed, PPP-Kinematic, PPP-Static and PPP-Fixed positioning modes.
+* RINEX 2.10,2.11,2.12 OBS/NAV/GNAV/HNAV/LNAV/QNAV, RINEX 3.00,3.01,3.02 OBS/NAV,RINEX 3.02 CLK,RTCM ver.2.3,RTCM ver.3.1 (with amendment 1-5), RTCM ver.3.2, BINEX, NTRIP 1.0, NMEA 0183, SP3-c, ANTEX 1.4, IONEX 1.0, NGS PCV and EMS 2.0.
+* Proprietary protocotols: NovAtel: OEM4/V/6,OEM3,OEMStar,Superstar II, Hemisphere: Eclipse,Crescent, u-blox: LEA-4T/5T/6T, SkyTraq: S1315F, JAVAD GRIL/GREIS, Furuno GW-10-II/III and NVS NV08C BINR, TCP/IP, NTRIP, local log file
+* Bluetooth and USB OTG communication
+* experimental SiRF IV protocol support
+
+Status: Alpha
+.
+
+Repo Type:git
+Repo:https://github.com/illarionov/RtkGps.git
+
+Build:1.0,1
+    commit=1b27b7
+    forceversion=yes
+    init=sed -i 's/@/:\/\//g;s/:little/\/little/g;s/:illar/\/illar/g' .gitmodules && \
+         git submodule update --init
+    scanignore=jni/simonlynen_android_libs/lapack/jni/clapack/INSTALL
+    buildjni=yes
+
+Maintainer Notes:
+The scanner is tripped by binaries that are only used for testing; see the README.install.
+Could rm test* rather than scanignore but fdroid doesn't recover afterwards,
+since they're submodules
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+
diff --git a/metadata/se.anyro.nfc_reader.txt b/metadata/se.anyro.nfc_reader.txt
index 2fc0c6e9d0..dbcd6e2f03 100644
--- a/metadata/se.anyro.nfc_reader.txt
+++ b/metadata/se.anyro.nfc_reader.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/nadam/nfc-reader
diff --git a/metadata/se.chalmers.doit.txt b/metadata/se.chalmers.doit.txt
index c278a6b6db..bb97052bb0 100644
--- a/metadata/se.chalmers.doit.txt
+++ b/metadata/se.chalmers.doit.txt
@@ -2,8 +2,8 @@ Disabled:Let's forget this one: alpha and probably won't get any more revisions
 Category:Office
 License:GPLv3
 Web Site:http://code.google.com/p/dat255-doit/
-Source Code:http://code.google.com/p/dat255-doit/source/checkout
-Issue Tracker:http://code.google.com/p/dat255-doit/issues/list
+Source Code:http://code.google.com/p/dat255-doit/source
+Issue Tracker:http://code.google.com/p/dat255-doit/issues
 
 Auto Name:doIT
 Summary:Todo lists
diff --git a/metadata/se.danielj.geometridestroyer.txt b/metadata/se.danielj.geometridestroyer.txt
new file mode 100644
index 0000000000..a41d1dfa23
--- /dev/null
+++ b/metadata/se.danielj.geometridestroyer.txt
@@ -0,0 +1,29 @@
+Categories:Games
+License:GPLv3
+Web Site:http://danielj.se/geometri-destroyer/
+Source Code:https://github.com/MaTachi/geometri-destroyer
+Issue Tracker:https://github.com/MaTachi/geometri-destroyer/issues
+
+Auto Name:Geometri Destroyer
+Summary:Simple game
+Description:
+Remove the green objects but don't let the blue objects touch the ground.
+.
+
+Repo Type:git
+Repo:https://github.com/MaTachi/geometri-destroyer.git
+
+Build:1.0.1,2
+    commit=1aa2e
+    subdir=geometri-destroyer-android
+    init=zip -r native.zip libs/armeabi* && \
+        mv ../geometri-destroyer/libs/gdx.jar libs/ && \
+        mv ../geometri-destroyer/libs/gdx-freetype.jar libs/ && \
+        echo 'source.dir=src;../geometri-destroyer/src' > ant.properties
+    build=unzip native.zip
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0.1
+Current Version Code:2
+
diff --git a/metadata/se.erikofsweden.findmyphone.txt b/metadata/se.erikofsweden.findmyphone.txt
index 3e835b8949..cc11768f3c 100644
--- a/metadata/se.erikofsweden.findmyphone.txt
+++ b/metadata/se.erikofsweden.findmyphone.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv2
 Web Site:http://erikofsweden.blogspot.com/p/findmyphone.html
 Source Code:http://sourceforge.net/scm/?type=svn&group_id=335164
@@ -22,10 +22,15 @@ Status: Beta.
 .
 
 Repo Type:git-svn
-Repo:https://findmyphone.svn.sourceforge.net/svnroot/findmyphone/trunk
+Repo:https://svn.code.sf.net/p/findmyphone/code/trunk
 
-Build Version:1.21B,10,33,prebuild=mv lib libs
-Build Version:1.22B,11,34,prebuild=mv lib libs
+Build:1.21B,10
+    commit=33
+    prebuild=mv lib libs
+
+Build:1.22B,11
+    commit=34
+    prebuild=mv lib libs
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/se.johanhil.clipboard.txt b/metadata/se.johanhil.clipboard.txt
index 6a2aeffab9..1d69afa55a 100644
--- a/metadata/se.johanhil.clipboard.txt
+++ b/metadata/se.johanhil.clipboard.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/johanhil/copy-to-clipboard
 Source Code:https://github.com/johanhil/copy-to-clipboard
@@ -21,8 +21,7 @@ Repo:https://github.com/johanhil/copy-to-clipboard.git
 Build Version:1.0,2,c6c466770fb7215d957118216c2414ae69ca1bc8,target=android-4
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:2
 
diff --git a/metadata/se.johanhil.duckduckgo.txt b/metadata/se.johanhil.duckduckgo.txt
index 36ea5614bc..dcb969d3e2 100644
--- a/metadata/se.johanhil.duckduckgo.txt
+++ b/metadata/se.johanhil.duckduckgo.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/johanhil/ddg-android
 Source Code:https://github.com/johanhil/ddg-android
diff --git a/metadata/se.peterbjorkman.android.trafikinfo.txt b/metadata/se.peterbjorkman.android.trafikinfo.txt
index 6fd9dd6d60..36c2636dae 100644
--- a/metadata/se.peterbjorkman.android.trafikinfo.txt
+++ b/metadata/se.peterbjorkman.android.trafikinfo.txt
@@ -3,8 +3,8 @@ AntiFeatures:NonFreeDep
 Category:Navigation
 License:GPLv3+
 Web Site:http://android.trafikinfo.nu/
-Source Code:http://code.google.com/p/trafikinfoandroid/source/checkout
-Issue Tracker:http://code.google.com/p/trafikinfoandroid/issues/list
+Source Code:http://code.google.com/p/trafikinfoandroid/source
+Issue Tracker:http://code.google.com/p/trafikinfoandroid/issues
 
 Auto Name:Trafikinfo.nu
 Summary:Show Swedish traffic information
@@ -17,7 +17,7 @@ the maps won't be visible because F-droid can't include API keys in the build. I
 the maps feature try the developer build from the website.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://trafikinfoandroid.googlecode.com/svn/trunk
 
 Build Version:0.9,12,628,encoding=utf-8
diff --git a/metadata/se.sandos.android.delayed.txt b/metadata/se.sandos.android.delayed.txt
index a97f65f4f9..e9d4868927 100644
--- a/metadata/se.sandos.android.delayed.txt
+++ b/metadata/se.sandos.android.delayed.txt
@@ -2,8 +2,8 @@ Disabled:Not working and in beta for two years
 Category:Navigation
 License:GPLv3
 Web Site:https://code.google.com/p/android-delayed/
-Source Code:https://code.google.com/p/android-delayed/source/browse
-Issue Tracker:https://code.google.com/p/android-delayed/issues/list
+Source Code:https://code.google.com/p/android-delayed/source
+Issue Tracker:https://code.google.com/p/android-delayed/issues
 Donate:https://code.google.com/p/android-delayed/
 
 Auto Name:Delayed
diff --git a/metadata/seanfoy.wherering.txt b/metadata/seanfoy.wherering.txt
index 91b64413c6..b9a5fde465 100644
--- a/metadata/seanfoy.wherering.txt
+++ b/metadata/seanfoy.wherering.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:GPLv3
 Web Site:http://code.google.com/p/wherering/
-Source Code:http://code.google.com/p/wherering/source/checkout
-Issue Tracker:http://code.google.com/p/wherering/issues/list
+Source Code:http://code.google.com/p/wherering/source
+Issue Tracker:http://code.google.com/p/wherering/issues
 
 Summary:Change ring mode by location
 Description:
@@ -13,11 +13,11 @@ location zone, configurable by radius. It uses GPS sparingly to save the battery
 Repo Type:hg
 Repo:http://code.google.com/p/wherering
 
-#Build Version:1.99.0,99,!wait for client ced797,subdir=WhereRing,target=android-7,prebuild=\
-#sed -i 's/%s (%s)/(%s)/g' res/values/strings.xml && sed -i 's/@debuggable@/false/g' AndroidManifest.xml && \
-#rm -rf ../WhereRingTest ant-support,init=mv AndroidManifest.xml.tmpl AndroidManifest.xml,forceversion=yes,forcevercode=yes
+Build Version:1.99.0,99,ced797,subdir=WhereRing,target=android-7,prebuild=\
+sed -i 's/%s (%s)/(%s)/g' res/values/strings.xml && sed -i 's/@debuggable@/false/g' AndroidManifest.xml && \
+rm -rf ../WhereRingTest ant-support,init=mv AndroidManifest.xml.tmpl AndroidManifest.xml,forceversion=yes,forcevercode=yes
 
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:1.99.0
 Current Version Code:99
 
diff --git a/metadata/si.modrajagoda.didi.txt b/metadata/si.modrajagoda.didi.txt
index 03ba9521ae..07c88e2a41 100644
--- a/metadata/si.modrajagoda.didi.txt
+++ b/metadata/si.modrajagoda.didi.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:
 Source Code:https://github.com/blaztriglav/did-i
diff --git a/metadata/siir.es.adbWireless.txt b/metadata/siir.es.adbWireless.txt
index e4c977cb52..783af4f8d6 100644
--- a/metadata/siir.es.adbWireless.txt
+++ b/metadata/siir.es.adbWireless.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3+
 Web Site:
 Source Code:
diff --git a/metadata/sites.mjwhitta.scripter.txt b/metadata/sites.mjwhitta.scripter.txt
index 555afbbc8f..e3e1fdfbfb 100644
--- a/metadata/sites.mjwhitta.scripter.txt
+++ b/metadata/sites.mjwhitta.scripter.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:
 Source Code:https://code.launchpad.net/~mjwhitta/+junk/Scripter
diff --git a/metadata/sk.baka.aedict.txt b/metadata/sk.baka.aedict.txt
index 08191ee490..7b2bfaf3e4 100644
--- a/metadata/sk.baka.aedict.txt
+++ b/metadata/sk.baka.aedict.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:GPLv3
 Web Site:https://code.google.com/p/aedict
-Source Code:https://code.google.com/p/aedict/source/list
-Issue Tracker:https://code.google.com/p/aedict/issues/list
+Source Code:https://code.google.com/p/aedict/source
+Issue Tracker:https://code.google.com/p/aedict/issues
 Donate:https://code.google.com/p/aedict/
 Bitcoin:1KJyEutxrm3yL7chvsciMJTvXahXoWE3Pw
 
diff --git a/metadata/sk.madzik.android.logcatudp.txt b/metadata/sk.madzik.android.logcatudp.txt
index 7b8cad769a..d5e52fa922 100644
--- a/metadata/sk.madzik.android.logcatudp.txt
+++ b/metadata/sk.madzik.android.logcatudp.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/logcatudp/
-Source Code:http://code.google.com/p/logcatudp/source/checkout
-Issue Tracker:http://code.google.com/p/logcatudp/issues/list
+Source Code:http://code.google.com/p/logcatudp/source
+Issue Tracker:http://code.google.com/p/logcatudp/issues
 
 Auto Name:Logcat to UDP
 Summary:Wireless logging
@@ -25,8 +25,7 @@ Repo:https://code.google.com/p/logcatudp/
 Build Version:0.5,5,235851
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5
 Current Version Code:5
 
diff --git a/metadata/sk.vx.connectbot.txt b/metadata/sk.vx.connectbot.txt
index b8011082a5..29d45d9dbc 100644
--- a/metadata/sk.vx.connectbot.txt
+++ b/metadata/sk.vx.connectbot.txt
@@ -1,4 +1,4 @@
-Category:Internet
+Categories:Internet
 License:Apache2
 Web Site:http://connectbot.vx.sk/
 Source Code:https://github.com/vx/connectbot
diff --git a/metadata/sonoroxadc.garethmurfin.co.uk.txt b/metadata/sonoroxadc.garethmurfin.co.uk.txt
index 5839d467bb..412aac93f8 100644
--- a/metadata/sonoroxadc.garethmurfin.co.uk.txt
+++ b/metadata/sonoroxadc.garethmurfin.co.uk.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPLv2+
 Web Site:http://www.radiantsilverlabs.com/gaz
 Source Code:https://github.com/amiga/sonorox
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 8ec395be3e..79a2509088 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/busybox-android/
-Source Code:http://code.google.com/p/busybox-android/source/checkout
-Issue Tracker:http://code.google.com/p/busybox-android/issues/list
+Source Code:http://code.google.com/p/busybox-android/source
+Issue Tracker:http://code.google.com/p/busybox-android/issues
 
 Summary:BusyBox installer
 Description:
@@ -13,28 +13,6 @@ small executable. It provides replacements for most of the utilities you
 usually find in GNU fileutils, shellutils, etc. See the BusyBox web site at
 http://www.busybox.net for more information. BusyBox itself is GPLv2
 licensed.
-
-app/src/stericson/busybox/donate/jobs/GetAvailableAppletsJob.java:47: error: method getBusyBoxApplets in class RootTools cannot be applied to given types;
-    [javac] 			applets = RootTools.getBusyBoxApplets(storagePath);
-    [javac] 			                   ^
-    [javac]   required: no arguments
-    [javac]   found: String
-    [javac]   reason: actual and formal argument lists differ in length
-    [javac] /home/gerry/fdroiddata/build/stericson.busybox.donate/app/src/stericson/busybox/donate/jobs/Install.java:39: error: method getBusyBoxVersion in class RootTools cannot be applied to given types;
-    [javac] 			String tmp_version = RootTools.getBusyBoxVersion(activity.getFilesDir().toString() + "/bb");
-    [javac] 			                              ^
-    [javac]   required: no arguments
-    [javac]   found: String
-    [javac]   reason: actual and formal argument lists differ in length
-    [javac] /home/gerry/fdroiddata/build/stericson.busybox.donate/app/src/stericson/busybox/donate/jobs/PrepareBinary.java:47: error: method getBusyBoxVersion in class RootTools cannot be applied to given types;
-    [javac] 		String version = RootTools.getBusyBoxVersion(storagePath);
-    [javac] 		                          ^
-    [javac]   required: no arguments
-    [javac]   found: String
-    [javac]   reason: actual and formal argument lists differ in length
-    [javac] Note: Some input files use or override a deprecated API.
-    [javac] Note: Recompile with -Xlint:deprecation for details.
-    [javac] 3 errors
 .
 
 Requires Root:Yes
diff --git a/metadata/teaonly.droideye.txt b/metadata/teaonly.droideye.txt
index 2082486a2d..9177a89906 100644
--- a/metadata/teaonly.droideye.txt
+++ b/metadata/teaonly.droideye.txt
@@ -1,4 +1,5 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:GPLv2
 Web Site:
 Source Code:https://github.com/Teaonly/android-eye
diff --git a/metadata/template b/metadata/template
index a7d260d1a8..8a06062e04 100644
--- a/metadata/template
+++ b/metadata/template
@@ -1,111 +1,62 @@
-## See http://f-droid.org/manual for details
-## Fields and comments which aren't used can be deleted
-## Blank lines are customary as they are seen here 
-# 
-# Only used for making an app disappear from the index
-Disabled:
-# Possible values are hard-coded in the F-Droid source code: separate with a ","
-AntiFeatures:
-# Not hard-coded but look at the pre-existing ones. Separate with a ";"
-Category:
-# The ''overall'' license: must be compatible with licenses of components
+# F-Droid metadata template
+#
+# See http://f-droid.org/manual for more details
+#
+# Fields that are commented out are optional
+ 
+# Disabled: (if an app must vanish from the repo)
+# AntiFeatures: (comma-separated) (possible values hard-coded in fdroidserver)
+Categories: (comma-separated)
 License:
-# Only use if different from Source Code
-Web Site:
-# Should be http(s)://
-Source Code:
-# Should be http(s):// 
-Issue Tracker:
-# A dedicated web page with donation buttons is preferred
-Donate:
-# See http://flattr.com
-FlattrID:
-# Add a comment about how to verify, such as URL for an issue
-Bitcoin:
 
-# Scripts will try to put the app's name here. Don't need to edit it
-Auto Name:
-# Only changes the name in the index. Not generally required
-Name:
-# Jargon-free description, not longer than 32 characters
-Summary:
-# Description goes ''under'' this field, terminated by a line with a single "."
+Web Site: (web link)
+Source Code: (web link)
+Issue Tracker: (web link)
+
+# Donate: (web link)
+# FlattrID: (number)
+# Bitcoin: (bitcoin address)
+
+# Name: (to override the name of the app in the index)
+Summary: (one sentence, no more than 30-40 chars)
 Description:
-Blank lines indicate a new paragraph and it is preferrable to make a new
-line for a new sentence.
-It is applicable to what would be the Recommended Version for most people 
-i.e. the version that's closest to the Current Version (see below) and also
-compatible with their device.
+Description of what the app does. It should be as objective as possible.
 
-The description should be: 
-* Fairly future proof, unless you intend to keep it updated 
-* Not be too short 
-* With a  maximum line length of 80 chars, unless the basic MediaWiki markup is used
+A blank line means a line break, i.e. the end of a paragraph.
 
-The following extra are examples of items that may be helpful —
+Bulleted lists can be used:
 
-Requires root: No. The app can reboot the phone if it is allowed root.
-
-Anti-features: 
-* Tracking: The app uploads usage stats — see the Website for details
-* Non-free Network Services: Calculations are done on the developers' server
-
-Google Ad library was removed before building.
-
-Supports x86 natively.
-
-Status: Last version and/or BETA and/or current version can't be built.
+* Item 1
+* Item 2
 
+Links can be added like this:
 [https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
+
+Links to other apps too: [[some.other.app]]
 .
 
-# Yes is the only possible value
-Requires Root:
+# Requires Root: Yes (f not having root breaks the app or renders it useless)
 
-## Repo and Build Version only apply to apps with source-built versions
-Repo Type:
-Repo:
-# Versions/Codes of each Build Version must be different from the others
-# Any jars or prebuilts should have references, preferably in the README
-# The following contains all possible parameters in the best order
-Build Version:version,version code,commit/tag,\
-subdir=<path/to/manifest or pom>,\
-submodules=yes,\
-init=xxxx && yyyy && ...,\
-target=android-x,\
-compilesdk=x,\
-update=[no|force|.;<path/to/x>;<path/to/y>;...],\
-encoding=xxxx,\
-rm=<relpath/to/x.apk>;<relpath/to/y.jar>;...,\
-extlibs=a/Av1.2.jar;b/Bv1.3.jar;...,\
-srclibs=a@r;b@r1;...,\
-patch=x.patch;...,\
-prebuild=xxxx && yyyy && ...,\
-build=xxxx && yyyy && ...,\
-buildjni=[yes|no|<dir list>],\
-maven=yes,\
-preassemble=task1 task2,\
-gradle=[main|flavor],\
-bindir=<path>,\
-antcommand=xxx
+# Repo and Build fields only matter in source-built apps
+Repo Type: (git, git-svn, svn, hg or bzr)
+Repo: (repo url, don't use auth
 
-# A more recent version i.e. one with a greater version code
-Build Version:
+# One for each source build
+# Build:<version>,<version code>
+#     commit=<tag/commit/rev>
+#     [...]
+#
+# For a complete list of flags, see the manual
 
-## Comments on what to watch for when adding new Build Versions (BVs) go here
+# Maintainer Notes:
+# Here go the notes to take into account for future updates, builds, etc.
+# Will be published in the wiki if present.
+# .
 
-# This field is best used at the discretion of the repo maintainers
-Auto Update Mode:
-# One of Tags, RepoManifest, Static, Market or None (in that order of preference)
-# If None or Market, describe why the other methods don't work
-# Tags and RepoManifest (RM) are automatic but check that the mechanism works
-# Use Static if you plan to let the maintainers know in person (so to speak)
-Update Check Mode:
-# These two values are usually in the AndroidManifest of the current release, 
-#  but may be automatically updated, depending on the value of the previous field
-Current Version:
-Current Version Code:
+Auto Update Mode: (see the manual)
+Update Check Mode: (see the manual)
+Current Version: (current version name)
+Current Version Code: (current version code, i.e. number)
 
-# The version at which it became impossible to build because of non-free elements
-No Source Since:
+# No Source Since: First version to be partially or completely missing upstream
 
diff --git a/metadata/template-minimal b/metadata/template-minimal
index c043991358..669a33f772 100644
--- a/metadata/template-minimal
+++ b/metadata/template-minimal
@@ -1,20 +1,43 @@
-Category:
+# F-Droid metadata template
+#
+# See http://f-droid.org/manual for more details
+ 
+Categories: (comma-separated)
 License:
-Web Site:
-Source Code:
-Issue Tracker:
 
-Summary:
+Web Site: (web link)
+Source Code: (web link)
+Issue Tracker: (web link)
+
+Summary: (one sentence, no more than 30-40 chars)
 Description:
+Description of what the app does. It should be as objective as possible.
+
+A blank line means a line break, i.e. the end of a paragraph.
+
+Bulleted lists can be used:
+
+* Item 1
+* Item 2
+
+Links can be added like this:
+[https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
+
+Links to other apps too: [[some.other.app]]
 .
 
-Repo Type:
-Repo:
+Repo Type: (git, git-svn, svn, hg or bzr)
+Repo: (repo url, don't use auth
 
-Build Version:
+# One for each source build
+# Build:<version>,<version code>
+#     commit=<tag/commit/rev>
+#     [...]
+#
+# For a complete list of flags, see the manual
 
-Auto Update Mode:
-Update Check Mode:
-Current Version:
-Current Version Code:
+Auto Update Mode: (see the manual)
+Update Check Mode: (see the manual)
+Current Version: (current version name)
+Current Version Code: (current version code, i.e. number)
 
diff --git a/metadata/tkj.android.homecontrol.mythmote.txt b/metadata/tkj.android.homecontrol.mythmote.txt
index 9b748ee8b9..a7aec1f14b 100644
--- a/metadata/tkj.android.homecontrol.mythmote.txt
+++ b/metadata/tkj.android.homecontrol.mythmote.txt
@@ -1,8 +1,8 @@
-Category:Multimedia
+Categories:Multimedia
 License:GPL
 Web Site:http://code.google.com/p/mythmote/
-Source Code:http://code.google.com/p/mythmote/source/checkout
-Issue Tracker:http://code.google.com/p/mythmote/issues/list
+Source Code:http://code.google.com/p/mythmote/source
+Issue Tracker:http://code.google.com/p/mythmote/issues
 
 Auto Name:mythmote
 Summary:Remote control for MythTV
@@ -11,15 +11,26 @@ A network remote control for MythTV.
 .
 
 Repo Type:git-svn
-Repo:http://mythmote.googlecode.com/svn/
+Repo:http://mythmote.googlecode.com/svn/trunk
 
-#Build Version:1.4.0,8,126,subdir=trunk,rm=trunk/src/tkj/android/homecontrol/mythmote/R.java
-Build Version:1.6.2,1304,241,subdir=trunk,rm=trunk/src/tkj/android/homecontrol/mythmote/R.java
-Build Version:1.7.1,1608,281,subdir=tags/mythmote-1.7.1,rm=tags/mythmote-1.7.1/src/tkj/android/homecontrol/mythmote/R.java
-Build Version:1.8.6,2308,327,subdir=trunk,rm=trunk/src/tkj/android/homecontrol/mythmote/R.java
+Build:1.6.2,1304
+    commit=241
+    rm=src/tkj/android/homecontrol/mythmote/R.java
+
+Build:1.7.1,1608
+    commit=279
+    rm=src/tkj/android/homecontrol/mythmote/R.java
+
+Build:1.8.6,2308
+    commit=327
+    rm=src/tkj/android/homecontrol/mythmote/R.java
+
+Build:1.9.0,2408
+    commit=350
+    rm=src/tkj/android/homecontrol/mythmote/R.java
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.8.6
-Current Version Code:2308
+Update Check Mode:RepoManifest
+Current Version:1.9.0
+Current Version Code:2408
 
diff --git a/metadata/to.doc.android.ipv6config.txt b/metadata/to.doc.android.ipv6config.txt
new file mode 100644
index 0000000000..d8514b1ce7
--- /dev/null
+++ b/metadata/to.doc.android.ipv6config.txt
@@ -0,0 +1,32 @@
+Categories:System
+License:GPLv3
+Web Site:http://www.mayrhofer.eu.org/android-ipv6config
+Source Code:https://gitorious.org/android-ipv6config/android-ipv6config
+Issue Tracker:
+
+Summary:IPv6 Configuration Tool
+Description:
+Provides the ability to configure some of the IPv6 kernel settings. Most
+importantly, it allows to automatically enable the "Privacy Extensions for
+Stateless Address Autoconfiguration in IPv6" as specified in IETF RFC4941
+and implemented by the standard Linux kernel.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://git.gitorious.org/android-ipv6config/android-ipv6config.git
+
+Build:3.0,8
+    commit=e687686
+    rm=donate;ant.properties
+
+Maintainer Notes:
+ant.properties is a symlink to outside the source tree
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:3.0
+Current Version Code:8
+
diff --git a/metadata/to.networld.android.divedroid.txt b/metadata/to.networld.android.divedroid.txt
index 27db1fdb42..a0782a9d77 100644
--- a/metadata/to.networld.android.divedroid.txt
+++ b/metadata/to.networld.android.divedroid.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:MIT
 Web Site:http://divedroid.android.networld.to
 Source Code:https://github.com/obale/divedroid
diff --git a/metadata/trikita.obsqr.txt b/metadata/trikita.obsqr.txt
index 5802ea3975..4a80aecca6 100644
--- a/metadata/trikita.obsqr.txt
+++ b/metadata/trikita.obsqr.txt
@@ -1,4 +1,4 @@
-Category:System
+Categories:System
 License:MIT
 Web Site:http://trikita.co/#obsqr
 Source Code:https://bitbucket.org/trikita/obsqr/src
@@ -9,8 +9,6 @@ Summary:QR code scanner
 Description:
 Fast and simple QR code scanner that uses the zbar library.
 Minimalistic design allows you to access QR content with a single tap.
-Can be launched by long pressing
-the hardware search button, if you have one.
 
 '''N.B''' QR codes only, not other kinds of barcodes.
 .
@@ -18,12 +16,26 @@ the hardware search button, if you have one.
 Repo Type:hg
 Repo:https://bitbucket.org/trikita/obsqr
 
-Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes,prebuild=bash fetch-zbar.sh
-Build Version:2.5,10,4c6ad70039ba,target=android-16,buildjni=yes,prebuild=bash fetch-zbar.sh
+Build:2.4,9
+    commit=071341595ce3
+    target=android-15
+    prebuild=bash fetch-zbar.sh
+    buildjni=yes
+
+Build:2.5,10
+    commit=4c6ad70039ba
+    target=android-16
+    prebuild=bash fetch-zbar.sh
+    buildjni=yes
+
+Build:2.6,11
+    commit=0b81963
+    target=android-19
+    prebuild=bash fetch-zbar.sh
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.5
-Current Version Code:10
+Update Check Mode:RepoManifest
+Current Version:2.6
+Current Version Code:11
 
diff --git a/metadata/tritop.android.SLWTrafficMeterWidget.txt b/metadata/tritop.android.SLWTrafficMeterWidget.txt
index 18dc2ca4c5..8e44c5e572 100644
--- a/metadata/tritop.android.SLWTrafficMeterWidget.txt
+++ b/metadata/tritop.android.SLWTrafficMeterWidget.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://code.google.com/p/slw-battery-widget/
-Source Code:https://code.google.com/p/slw-battery-widget/source/list
-Issue Tracker:https://code.google.com/p/slw-battery-widget/issues/list
+Source Code:https://code.google.com/p/slw-battery-widget/source
+Issue Tracker:https://code.google.com/p/slw-battery-widget/issues
 
 Auto Name:SLW Traffic Meter Widget
 Summary:Simple internet traffic widget
@@ -13,12 +13,10 @@ Phone my need to reboot before widget becomes available
 Repo Type:git-svn
 Repo:http://slw-battery-widget.googlecode.com/svn/SLWTrafficMeterWidget
 
-#Impossible to find commit by looking at log
 Build Version:1.1,2,69,target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/tritop.android.androsens.txt b/metadata/tritop.android.androsens.txt
index dea13552a7..c9cca679f0 100644
--- a/metadata/tritop.android.androsens.txt
+++ b/metadata/tritop.android.androsens.txt
@@ -1,7 +1,7 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/androsens
-Source Code:https://code.google.com/p/androsens/source/list
+Source Code:https://code.google.com/p/androsens/source
 Issue Tracker:
 
 Auto Name:Androsens
diff --git a/metadata/tritop.androidSLWCpuWidget.txt b/metadata/tritop.androidSLWCpuWidget.txt
index 33960f1ed0..a7984adedb 100644
--- a/metadata/tritop.androidSLWCpuWidget.txt
+++ b/metadata/tritop.androidSLWCpuWidget.txt
@@ -1,8 +1,8 @@
-Category:Internet
+Categories:Internet
 License:GPLv3
 Web Site:https://code.google.com/p/slw-battery-widget/
-Source Code:https://code.google.com/p/slw-battery-widget/source/list
-Issue Tracker:https://code.google.com/p/slw-battery-widget/issues/list
+Source Code:https://code.google.com/p/slw-battery-widget/source
+Issue Tracker:https://code.google.com/p/slw-battery-widget/issues
 
 Auto Name:SLW Cpu Widget
 Summary:Simple CPU widget
@@ -13,12 +13,10 @@ Phone may need to be rebooted on android 4+ for the widget to be available
 Repo Type:git-svn
 Repo:http://slw-battery-widget.googlecode.com/svn/SLWCpuWidget
 
-#Impossible to find commit by looking at log
 Build Version:1.5,6,78
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:6
 
diff --git a/metadata/tuioDroid.impl.txt b/metadata/tuioDroid.impl.txt
index 0424591829..eeb185ac80 100644
--- a/metadata/tuioDroid.impl.txt
+++ b/metadata/tuioDroid.impl.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:https://code.google.com/p/tuiodroid/
-Source Code:https://code.google.com/p/tuiodroid/source/checkout
-Issue Tracker:https://code.google.com/p/tuiodroid/issues/list
+Source Code:https://code.google.com/p/tuiodroid/source
+Issue Tracker:https://code.google.com/p/tuiodroid/issues
 
 Auto Name:TUIOdroid
 Summary:Send multitouch events
diff --git a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
index 1b682dd2b7..14733809d2 100644
--- a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
+++ b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Apache2
 Web Site:https://github.com/ucam-cl-dtg/barcodebox
 Source Code:https://github.com/ucam-cl-dtg/barcodebox
@@ -18,11 +18,14 @@ history of barcodes to CSV.
 Repo Type:git
 Repo:https://github.com/ucam-cl-dtg/barcodebox.git
 
-Build Version:1.1.1,3,a78f80f87298bb1cba0d80bc699ba2841be66e2a
+Build:1.1.1,3
+    commit=a78f80f87298bb1cba0d80bc699ba2841be66e2a
+
+Build:1.1.2,4
+    commit=e18c34b4fc035c
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.1
-Current Version Code:3
+Update Check Mode:RepoManifest
+Current Version:1.1.2
+Current Version Code:4
 
diff --git a/metadata/uk.ac.ed.inf.mandelbrotmaps.txt b/metadata/uk.ac.ed.inf.mandelbrotmaps.txt
new file mode 100644
index 0000000000..5d98d53a6a
--- /dev/null
+++ b/metadata/uk.ac.ed.inf.mandelbrotmaps.txt
@@ -0,0 +1,25 @@
+Categories:Science & Education
+License:GPLv3
+Web Site:
+Source Code:https://github.com/withad/Mandelbrot-Maps-on-Android
+Issue Tracker:https://github.com/withad/Mandelbrot-Maps-on-Android/issues
+
+Auto Name:Mandelbrot Maps
+Summary:Fractal viewer
+Description:
+Generates the Mandelbrot fractal, and at each point, allows you to see
+the associated Julia set fractal.
+.
+
+Repo Type:git
+Repo:https://github.com/withad/Mandelbrot-Maps-on-Android.git
+
+Build:1.01,2
+    commit=32f397669847c23a
+    subdir=MandelbrotMapsAndroid
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.01
+Current Version Code:2
+
diff --git a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt b/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
index 997f91955a..af612ea95e 100644
--- a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
+++ b/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
@@ -1,4 +1,4 @@
-Category:Development
+Categories:Development
 License:Apache2
 Web Site:http://www.intrications.com
 Source Code:https://github.com/intrications/intent-intercept
@@ -17,14 +17,29 @@ Some details of the intent can now be edited before resending it.
 Repo Type:git
 Repo:https://github.com/intrications/intent-intercept.git
 
-Build Version:2.0,100,965ec1d9ed,submodules=yes,subdir=IntentIntercept,target=android-16,update=\
-.;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport
-Build Version:2.01,101,2a5e768b6e,submodules=yes,subdir=IntentIntercept,target=android-16,update=\
-.;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport
+Build:2.0,100
+    commit=965ec1d9ed
+    subdir=IntentIntercept
+    submodules=yes
+    target=android-16
+    update=.;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport
+
+Build:2.01,101
+    commit=2a5e768b6e
+    subdir=IntentIntercept
+    submodules=yes
+    target=android-16
+
+Build:2.0.3,103
+    commit=70a65774ac9a
+    subdir=IntentIntercept
+
+Build:2.0.4,204
+    commit=1e1aeb93a1c6
+    subdir=IntentIntercept
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:2.01
-Current Version Code:101
+Update Check Mode:RepoManifest
+Current Version:2.0.4
+Current Version Code:204
 
diff --git a/metadata/uk.co.bitethebullet.android.token.txt b/metadata/uk.co.bitethebullet.android.token.txt
index 79dfde0987..f674425212 100644
--- a/metadata/uk.co.bitethebullet.android.token.txt
+++ b/metadata/uk.co.bitethebullet.android.token.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:GPLv3
 Web Site:http://code.google.com/p/androidtoken/
-Source Code:http://code.google.com/p/androidtoken/source/list
-Issue Tracker:http://code.google.com/p/androidtoken/issues/list
+Source Code:http://code.google.com/p/androidtoken/source
+Issue Tracker:http://code.google.com/p/androidtoken/issues
 
 Auto Name:Android Token
 Summary:OATH software tokens
diff --git a/metadata/uk.co.busydoingnothing.prevo.txt b/metadata/uk.co.busydoingnothing.prevo.txt
index a265e88171..9f11a8a351 100644
--- a/metadata/uk.co.busydoingnothing.prevo.txt
+++ b/metadata/uk.co.busydoingnothing.prevo.txt
@@ -1,4 +1,4 @@
-Category:Science & Education
+Categories:Science & Education
 License:GPLv2
 Web Site:http://www.busydoingnothing.co.uk/prevo/
 Source Code:http://git.busydoingnothing.co.uk/cgit.cgi/prevo-android.git/
diff --git a/metadata/uk.co.danieljarvis.android.flashback.txt b/metadata/uk.co.danieljarvis.android.flashback.txt
new file mode 100644
index 0000000000..81d75e62eb
--- /dev/null
+++ b/metadata/uk.co.danieljarvis.android.flashback.txt
@@ -0,0 +1,29 @@
+Categories:Phone & SMS
+License:Apache2
+Web Site:
+Source Code:https://github.com/daj/flashback
+Issue Tracker:https://github.com/daj/flashback/issues
+
+Auto Name:Flashback
+Summary:Display caller history
+Description:
+When you receive a call the app displays the history of
+your interactions with the caller.
+.
+
+Repo Type:git
+Repo:https://github.com/daj/flashback.git
+
+Build:1.14,14
+    commit=33230
+    subdir=Flashback
+    gradle=yes
+
+Build:1.15,15
+    disable=not published
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.15
+Current Version Code:15
+
diff --git a/metadata/uk.co.jarofgreen.JustADamnCompass.txt b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
index da5adebec5..feb079b313 100644
--- a/metadata/uk.co.jarofgreen.JustADamnCompass.txt
+++ b/metadata/uk.co.jarofgreen.JustADamnCompass.txt
@@ -1,8 +1,8 @@
-Category:Navigation
+Categories:Navigation
 License:Apache2
 Web Site:https://github.com/jarofgreen/Just-A-Damn-Compass
 Source Code:https://github.com/jarofgreen/Just-A-Damn-Compass
-Issue Tracker:https://github.com/jarofgreen/Just-A-Damn-Compass
+Issue Tracker:https://github.com/jarofgreen/Just-A-Damn-Compass/issues
 
 Auto Name:Just A Damn Compass
 Summary:Simple Compass
diff --git a/metadata/uk.org.cardboardbox.wonderdroid.txt b/metadata/uk.org.cardboardbox.wonderdroid.txt
index e77624c6c7..98330e31e5 100644
--- a/metadata/uk.org.cardboardbox.wonderdroid.txt
+++ b/metadata/uk.org.cardboardbox.wonderdroid.txt
@@ -1,33 +1,55 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:GPL
 Web Site:http://code.google.com/p/wonderdroid
-Source Code:http://code.google.com/p/wonderdroid/source/checkout
-Issue Tracker:http://code.google.com/p/wonderdroid/issues/list
+Source Code:http://code.google.com/p/wonderdroid/source
+Issue Tracker:http://code.google.com/p/wonderdroid/issues
 
 Auto Name:WonderDroid
 Summary:Game emulator
 Description:
 Bandai WonderSwan (Mono & Color) emulator. Full instructions are on the website.
 
-The Google Admob library has been replaced with an open-source library that
-does nothing.
+The proprietary Google Admob library has been replaced with an open-source
+library that does nothing.
+
+Tracking: Crash reports are sent silently without user interaction.
 .
 
 Repo Type:git
 Repo:https://code.google.com/p/wonderdroid/
 
-Build Version:1.8b2,36,b75f439e745,subdir=wonderdroid,buildjni=yes,srclibs=MobAdMob@2d5736,prebuild=\
-echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
-Build Version:1.8c,37,1a14c45ffdeb,subdir=wonderdroid,buildjni=yes,srclibs=MobAdMob@2d5736,prebuild=\
-echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
+Build:1.8b2,36
+    commit=b75f439e745
+    subdir=wonderdroid
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
+        rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni=yes
+
+Build:1.8c,37
+    commit=1a14c45ffdeb
+    subdir=wonderdroid
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
+    buildjni=yes
+
+Build:1.9,39
+    commit=5d92956205f5
+    patch=jni.diff
+    subdir=wonderdroid
+    srclibs=MobAdMob@3bd7888;ActionBarSherlock@4.4.0
+    prebuild=\
+        echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "android.library.reference.2=$$ActionBarSherlock$$" >> project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.8c
-Current Version Code:37
+Update Check Mode:RepoManifest
+Current Version:1.9
+Current Version Code:39
 
diff --git a/metadata/uk.org.cardboardbox.wonderdroid/jni.diff b/metadata/uk.org.cardboardbox.wonderdroid/jni.diff
new file mode 100644
index 0000000000..6ccba1cb59
--- /dev/null
+++ b/metadata/uk.org.cardboardbox.wonderdroid/jni.diff
@@ -0,0 +1,13 @@
+diff --git a/wonderdroid/jni/wswan/jni.c b/wonderdroid/jni/wswan/jni.c
+index 666a5d1..22524ad 100644
+--- a/wonderdroid/jni/wswan/jni.c
++++ b/wonderdroid/jni/wswan/jni.c
+@@ -75,7 +75,7 @@ JNIEXPORT void JNICALL Java_uk_org_cardboardbox_wonderdroid_WonderSwan_load(JNIE
+ 	}
+ 
+ 	snprintf(temp, sizeof(temp), "Loading %s", str);
+-	LOGD(temp);
++	LOGD("%s", temp);
+ 	FILE* file = fopen(str, "r");
+ 	if (file != NULL) {
+ 		LOGD("The file loaded!!!");
diff --git a/metadata/uk.org.ngo.squeezer.txt b/metadata/uk.org.ngo.squeezer.txt
index fe4b22e47c..d3f241ff5c 100644
--- a/metadata/uk.org.ngo.squeezer.txt
+++ b/metadata/uk.org.ngo.squeezer.txt
@@ -1,8 +1,9 @@
-Category:Multimedia
+AntiFeatures:UpstreamNonFree
+Categories:Multimedia
 License:Apache2
 Web Site:http://code.google.com/p/android-squeezer/
 Source Code:https://github.com/nikclayton/android-squeezer
-Issue Tracker:http://code.google.com/p/android-squeezer/issues/list
+Issue Tracker:http://code.google.com/p/android-squeezer/issues
 
 Auto Name:Squeezer
 Summary:Squeezebox remote control app
diff --git a/metadata/urbanstew.RehearsalAssistant.txt b/metadata/urbanstew.RehearsalAssistant.txt
index 34b06b1076..1471d61cbf 100644
--- a/metadata/urbanstew.RehearsalAssistant.txt
+++ b/metadata/urbanstew.RehearsalAssistant.txt
@@ -1,4 +1,4 @@
-Category:Office
+Categories:Office
 License:GPLv2
 Web Site:http://urbanstew.org/rehearsalassistant/
 Source Code:http://sourceforge.net/projects/rehearsalassist/develop
@@ -24,14 +24,23 @@ Also works great for shopping lists and
 other kinds of reminders.
 .
 
-Repo Type:svn
-Repo:https://rehearsalassist.svn.sourceforge.net/svnroot/rehearsalassist/android/trunk
+Repo Type:git-svn
+Repo:https://svn.code.sf.net/p/rehearsalassist/code/android/trunk
 
-Build Version:0.8.2,22,90,target=android-8,prebuild=mkdir -p gen/urbanstew/RehearsalAssistant && aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
-Build Version:0.9,26,!Source missing - see https://sourceforge.net/tracker/index.php?func=detail&aid=3196094&group_id=226240&atid=1067598
+Build:0.8.2,22
+    commit=90
+    target=android-8
+    prebuild=mkdir -p gen/urbanstew/RehearsalAssistant && \
+        aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
+
+Build:0.9,26
+    commit=100
+    target=android-8
+    build=mkdir -p gen/urbanstew/RehearsalAssistant && \
+        aidl aidl/urbanstew/RehearsalAssistant/IRecordService.aidl gen/urbanstew/RehearsalAssistant/IRecordService.java
 
 Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.8.2
-Current Version Code:22
+Update Check Mode:RepoManifest
+Current Version:0.9
+Current Version Code:26
 
diff --git a/metadata/us.bravender.android.dongsa.txt b/metadata/us.bravender.android.dongsa.txt
index 6fbc21b871..1153ef1737 100644
--- a/metadata/us.bravender.android.dongsa.txt
+++ b/metadata/us.bravender.android.dongsa.txt
@@ -1,8 +1,8 @@
-Category:Science & Education
+Categories:Science & Education
 License:AGPLv3
 Web Site:https://github.com/dbravender/korean_conjugation
 Source Code:https://github.com/dbravender/korean_conjugation
-Issue Tracker:https://github.com/dbravender/korean_conjugation
+Issue Tracker:https://github.com/dbravender/korean_conjugation/issues
 
 Auto Name:Dongsa
 Summary:Korean verb conjugation tool
diff --git a/metadata/us.lindanrandy.cidrcalculator.txt b/metadata/us.lindanrandy.cidrcalculator.txt
index 731bdf4929..cdf510fe54 100644
--- a/metadata/us.lindanrandy.cidrcalculator.txt
+++ b/metadata/us.lindanrandy.cidrcalculator.txt
@@ -1,8 +1,8 @@
-Category:Office
+Categories:Office
 License:Apache2
 Web Site:https://code.google.com/p/cidrcalculator/
-Source Code:https://code.google.com/p/cidrcalculator/source/browse/
-Issue Tracker:https://code.google.com/p/cidrcalculator/issues/list
+Source Code:https://code.google.com/p/cidrcalculator/source
+Issue Tracker:https://code.google.com/p/cidrcalculator/issues
 
 Auto Name:CIDR Calculator
 Summary:Internet routing calculation
@@ -12,16 +12,27 @@ subnet calculator for network engineers to quickly determine what
 the address range is of a subnet.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://cidrcalculator.googlecode.com/svn/trunk/
 
-Build Version:1.13,115,31,target=android-8
-Build Version:1.14,116,!No source available
-Build Version:1.16,118,32,target=android-11
+Build:1.13,115
+    commit=31
+    target=android-8
+
+Build:1.14,116
+    disable=No source available
+    commit=unknown - see disabled
+
+Build:1.16,118
+    commit=32
+    target=android-11
+
+Build:1.17,119
+    commit=34
+    target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.16
-Current Version Code:118
+Update Check Mode:RepoManifest
+Current Version:1.17
+Current Version Code:119
 
diff --git a/metadata/vnd.blueararat.kaleidoscope6.txt b/metadata/vnd.blueararat.kaleidoscope6.txt
index d4227d10c8..18333dbfa9 100644
--- a/metadata/vnd.blueararat.kaleidoscope6.txt
+++ b/metadata/vnd.blueararat.kaleidoscope6.txt
@@ -1,4 +1,4 @@
-Category:Multimedia
+Categories:Multimedia
 License:Public Domain
 Web Site:https://github.com/prrt714/Kaleidoscope
 Source Code:https://github.com/prrt714/Kaleidoscope
@@ -19,8 +19,7 @@ Repo:https://github.com/prrt714/Kaleidoscope.git
 Build Version:1.1.2,18,d851b
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1.2
 Current Version Code:18
 
diff --git a/metadata/vu.de.urpool.quickdroid.txt b/metadata/vu.de.urpool.quickdroid.txt
index b3838ba061..2828bf0593 100644
--- a/metadata/vu.de.urpool.quickdroid.txt
+++ b/metadata/vu.de.urpool.quickdroid.txt
@@ -1,8 +1,8 @@
-Category:System
+Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/quickdroid/
-Source Code:http://code.google.com/p/quickdroid/source/checkout
-Issue Tracker:http://code.google.com/p/quickdroid/issues/list
+Source Code:http://code.google.com/p/quickdroid/source
+Issue Tracker:http://code.google.com/p/quickdroid/issues
 
 Auto Name:Quickdroid
 Summary:Search apps, contacts and more
@@ -16,19 +16,53 @@ Launchy and GNOME Do for other systems.
 Repo Type:git-svn
 Repo:http://quickdroid.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:2.9.4,31,65,subdir=Quickdroid,target=android-7
-Build Version:3.0,37,75,subdir=Quickdroid,target=android-10
-Build Version:3.0.1,38,76,subdir=Quickdroid,target=android-10
-Build Version:4.0.2,42,106,subdir=Quickdroid,target=android-15
-Build Version:4.1,43,109,subdir=Quickdroid,target=android-15
-Build Version:4.2.1,45,114,subdir=Quickdroid,target=android-16
-Build Version:4.3,47,119,subdir=Quickdroid,target=android-16
-Build Version:4.3.1,48,!not published,subdir=Quickdroid
-Build Version:4.3.2,49,121,subdir=Quickdroid,prebuild=\
-sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
+Build:2.9.4,31
+    commit=65
+    subdir=Quickdroid
+    target=android-7
+
+Build:3.0,37
+    commit=75
+    subdir=Quickdroid
+    target=android-10
+
+Build:3.0.1,38
+    commit=76
+    subdir=Quickdroid
+    target=android-10
+
+Build:4.0.2,42
+    commit=106
+    subdir=Quickdroid
+    target=android-15
+
+Build:4.1,43
+    commit=109
+    subdir=Quickdroid
+    target=android-15
+
+Build:4.2.1,45
+    commit=114
+    subdir=Quickdroid
+    target=android-16
+
+Build:4.3,47
+    commit=119
+    subdir=Quickdroid
+    target=android-16
+
+Build:4.3.1,48
+    disable=not published
+    commit=unknown - see disabled
+    subdir=Quickdroid
+
+Build:4.3.2,49
+    commit=121
+    subdir=Quickdroid
+    prebuild=sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:4.3.2
-Current Version Code:49
+Current Version:4.4
+Current Version Code:50
 
diff --git a/metadata/wb.receiptspro.txt b/metadata/wb.receiptspro.txt
index c29400ff85..06fcf8b8b5 100644
--- a/metadata/wb.receiptspro.txt
+++ b/metadata/wb.receiptspro.txt
@@ -1,10 +1,10 @@
-Category:Office
+Categories:Office
 License:AGPLv3
 Web Site:
 Source Code:https://github.com/wbaumann/SmartReceiptsPro
 Issue Tracker:https://github.com/wbaumann/SmartReceiptsPro/issues
 
-Auto Name:Smart Receipts
+Auto Name:Smart Receipts Pro
 Summary:Receipt scanner/expense reporter
 Description:
 Turns your phone into a receipt scanner and expense report generator. Just
@@ -20,24 +20,46 @@ Repo:https://github.com/wbaumann/SmartReceiptsPro.git
 
 # default.properties references an unknown lib, breaking the build. Fortunately, the lib is not needed.
 # See https://github.com/wbaumann/Smart-Receipts/issues/2
-Build Version:1.1.1,12,d5684ee0bb7210e8b9205e932feba1b2eed21f50,subdir=SmartReceipts,prebuild=sed -i -e 's/^android.library.reference.1/#android.library.reference.1/' project.properties
-# the above issue is supposed to be fixed but still it won't build
-#Build Version:1.1.14,45,e51ae123,subdir=SmartReceipts
-Build Version:1.2.1,53,!Build problems 84c786b6a5,subdir=SmartReceipts,target=android-8,prebuild=\
-mv lib libs && rm libs/wbflex.jar && \
-sed -i -e 's/^android.library.reference.1/#android.library.reference.1/' project.properties
-Build Version:2.2.1,80,v2.2.1,forceversion=yes,init=rm -rf bin gen,\
-srclibs=ActionBarSherlock@4.1.0;AndroidCamera-WB@v2.2.1;\
-Mini-WB@2ff534;SmartReceipts@946fd63b4,prebuild=\
-cp $$SmartReceipts$$/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-cp $$SmartReceipts$$/libs/android-support-v4.jar $$AndroidCamera-WB$$/libs/ && \
-rm $$AndroidCamera-WB$$/src/wb/android/google/camera/util/LinkedNode.java && \
-sed -i 's@\(.1=\).*@\1$$SmartReceipts$$@' project.properties 
+Build:1.1.1,12
+    commit=d5684ee0bb7210e8b9205e932feba1b2eed21f50
+    subdir=SmartReceipts
+    prebuild=sed -i -e 's/^android.library.reference.1/#android.library.reference.1/' project.properties
+
+Build:1.2.1,53
+    disable=!Build problems 84c786b6a5
+    commit=unknown - see disabled
+    subdir=SmartReceipts
+    target=android-8
+    prebuild=mv lib libs && \
+        rm libs/wbflex.jar && \
+        sed -i -e 's/^android.library.reference.1/#android.library.reference.1/' project.properties
+
+Build:2.2.0,80
+    commit=342435f4c
+    init=rm -rf bin gen
+    srclibs=ActionBarSherlock@4.1.0;AndroidCamera-WB@v2.2.1;Mini-WB@2ff534;SmartReceipts@a286f742dab
+    prebuild=cp $$SmartReceipts$$/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        cp $$SmartReceipts$$/libs/android-support-v4.jar $$AndroidCamera-WB$$/libs/ && \
+        rm $$AndroidCamera-WB$$/src/wb/android/google/camera/util/LinkedNode.java && \
+        sed -i 's@\(.1=\).*@\1$$SmartReceipts$$@' project.properties 
+
+Build:2.2.1,82
+    commit=5c9ae8d29
+    init=rm -rf bin gen
+    srclibs=ActionBarSherlock@4.1.0;AndroidCamera-WB@v2.2.1;Mini-WB@2ff534;SmartReceipts@946fd63b4
+    prebuild=cp $$SmartReceipts$$/libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
+        cp $$SmartReceipts$$/libs/android-support-v4.jar $$AndroidCamera-WB$$/libs/ && \
+        rm $$AndroidCamera-WB$$/src/wb/android/google/camera/util/LinkedNode.java && \
+        sed -i 's@\(.1=\).*@\1$$SmartReceipts$$@' project.properties 
+
+Build:3.0,86
+    disable=java errors
+    commit=v3.0.0
+    srclibs=ActionBarSherlock@4.4.0;AndroidCamera-WB@v3.0.0;Mini-WB@v3.0.0;1:SmartReceipts@v3.0.0
+    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
-# Tags can be used hopefully for srclibs in next version
 Auto Update Mode:None
-# device variable
 Update Check Mode:Tags
-Current Version:2.2.0
-Current Version Code:80
+Current Version:3.0.0
+Current Version Code:86
 
diff --git a/metadata/zame.GloomyDungeons.opensource.game.txt b/metadata/zame.GloomyDungeons.opensource.game.txt
index 5bb7c81536..ddfbe134f7 100644
--- a/metadata/zame.GloomyDungeons.opensource.game.txt
+++ b/metadata/zame.GloomyDungeons.opensource.game.txt
@@ -1,4 +1,5 @@
-Category:Games
+AntiFeatures:UpstreamNonFree
+Categories:Games
 License:MIT
 Web Site:http://mobile.zame-dev.org/gloomy
 Source Code:https://github.com/restorer/Gloomy-Dungeons-3D
@@ -27,14 +28,21 @@ Repo Type:git
 Repo:https://github.com/restorer/Gloomy-Dungeons-3D
 
 #Note: time-based version/vercode - cannot be rebuilt the samie
-Build Version:2013.03.07.0416,1362629775,05e6bb5422,\
-novcheck=yes,srclibs=NoAnalytics@158a4a,\
-scanignore=tools/builder/additional-libs/armeabi/libZControllerLib_Android.so,\
-subdir=.build,init=cd .. && sed -i '54\,57d' source/AndroidManifest.xml && \
-sed -i 's@\$NDKBUILDTOOL@$$NDK$$/ndk-build@g' tools/builder/build-fdroid.sh && \
-rm source/libs/libGoogleAnalytics.jar && ./f-build opensource,prebuild=\
-echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties,buildjni=no
+Build:2013.03.07.0416,1362629775
+    commit=05e6bb5422
+    subdir=.build
+    init=cd .. && \
+        sed -i '54,57d' source/AndroidManifest.xml && \
+        sed -i 's@\$NDKBUILDTOOL@$$NDK$$/ndk-build@g' tools/builder/build-fdroid.sh && \
+        rm source/libs/libGoogleAnalytics.jar && \
+        ./f-build opensource
+    srclibs=NoAnalytics@158a4a
+    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+    scanignore=tools/builder/additional-libs/armeabi/libZControllerLib_Android.so
+    buildjni=no
+    novcheck=yes
 
+Auto Update Mode:None
 #In Market under zame.GloomyDungeons.fullversion.game & has non-free resources
 Update Check Mode:Static
 #Need to fill this with proper value
diff --git a/srclibs/ActionBar-PullToRefresh.txt b/srclibs/ActionBar-PullToRefresh.txt
new file mode 100644
index 0000000000..4eb285acc2
--- /dev/null
+++ b/srclibs/ActionBar-PullToRefresh.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/chrisbanes/ActionBar-PullToRefresh.git
+
+Subdir:library
+
+Update Project:Yes
+
diff --git a/srclibs/Aerc.txt b/srclibs/Aerc.txt
new file mode 100644
index 0000000000..a7b1657136
--- /dev/null
+++ b/srclibs/Aerc.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://code.google.com/p/aerc/
+
+Update Project:Yes
diff --git a/srclibs/AndroidCamera-WB.txt b/srclibs/AndroidCamera-WB.txt
index 999e871381..4bd3bfbed9 100644
--- a/srclibs/AndroidCamera-WB.txt
+++ b/srclibs/AndroidCamera-WB.txt
@@ -3,5 +3,3 @@ Repo:https://github.com/wbaumann/AndroidCamera
 
 Update Project:Yes
 
-Prepare:rm -rf bin gen
-
diff --git a/srclibs/AppRater.txt b/srclibs/AppRater.txt
new file mode 100644
index 0000000000..25c1869d27
--- /dev/null
+++ b/srclibs/AppRater.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/codechimp-org/AppRater.git
+
+Subdir:AppRater
+
+Update Project:Yes
+
diff --git a/srclibs/Cacheword.txt b/srclibs/Cacheword.txt
new file mode 100644
index 0000000000..019db8ea1a
--- /dev/null
+++ b/srclibs/Cacheword.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/guardianproject/cacheword
+Subdir:cachewordlib
+Update Project:Yes
diff --git a/srclibs/ChangeLog.txt b/srclibs/ChangeLog.txt
new file mode 100644
index 0000000000..cbf81f1c91
--- /dev/null
+++ b/srclibs/ChangeLog.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/gabrielemariotti/changeloglib.git
+
+Subdir:ChangeLogLibrary
diff --git a/srclibs/Changelog-cketti.txt b/srclibs/Changelog-cketti.txt
new file mode 100644
index 0000000000..0420c8bd0d
--- /dev/null
+++ b/srclibs/Changelog-cketti.txt
@@ -0,0 +1,6 @@
+Repo Type:git
+Repo:https://github.com/cketti/ckChangeLog
+
+Subdir:library,ckChangeLog/src/main
+Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\ntarget=android-19' > project.properties
+Update Project:Yes
diff --git a/srclibs/ClementineDeps.txt b/srclibs/ClementineDeps.txt
new file mode 100644
index 0000000000..4e449c1289
--- /dev/null
+++ b/srclibs/ClementineDeps.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/clementine-player/Android-Remote-Dependencies
+Prepare:$$SDK$$/tools/android update project -p clementine-remote-android.dep-abs 
diff --git a/srclibs/Crouton.txt b/srclibs/Crouton.txt
index ec79fb6d78..c8a30b0169 100644
--- a/srclibs/Crouton.txt
+++ b/srclibs/Crouton.txt
@@ -3,4 +3,6 @@ Repo:https://github.com/keyboardsurfer/Crouton
 
 Subdir:library
 
+# for support jar
+Prepare:mkdir -p libs
 Update Project:Yes
diff --git a/srclibs/DateSlider.txt b/srclibs/DateSlider.txt
index 6668d5d099..241f1ba573 100644
--- a/srclibs/DateSlider.txt
+++ b/srclibs/DateSlider.txt
@@ -3,5 +3,7 @@ Repo:http://android-dateslider.googlecode.com/svn/trunk/
 
 Subdir:android-dateslider
 
+Prepare:echo 'target=android-10' > project.properties
+
 Update Project:Yes
 
diff --git a/srclibs/Easing.txt b/srclibs/Easing.txt
new file mode 100644
index 0000000000..7730aa5a90
--- /dev/null
+++ b/srclibs/Easing.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/sephiroth74/Android-Easing
+
+Subdir:library
diff --git a/srclibs/F5.txt b/srclibs/F5.txt
new file mode 100644
index 0000000000..69747f665c
--- /dev/null
+++ b/srclibs/F5.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/harlo/F5Android
+Update Project:Yes
+Prepare:$$NDK$$/ndk-build
diff --git a/srclibs/GhostCommander.txt b/srclibs/GhostCommander.txt
index c6adf3b336..7b2b58b825 100644
--- a/srclibs/GhostCommander.txt
+++ b/srclibs/GhostCommander.txt
@@ -1,3 +1,2 @@
 Repo Type:git-svn
 Repo:http://svn.code.sf.net/p/ghostcommander/code/
-Prepare:rm -rf gen/ && $$SDK$$/tools/android update project -p . -t android-17
diff --git a/srclibs/GreenDroid.txt b/srclibs/GreenDroid.txt
index c2f7304f8b..5fda97dc88 100644
--- a/srclibs/GreenDroid.txt
+++ b/srclibs/GreenDroid.txt
@@ -1,3 +1,5 @@
 Repo Type:git
 Repo:https://github.com/cyrilmottier/GreenDroid.git
 
+Subdir:GreenDroid
+Prepare:$$SDK$$/tools/android update project -p . -t android-8
diff --git a/srclibs/HoloAccent.txt b/srclibs/HoloAccent.txt
new file mode 100644
index 0000000000..93ee71c261
--- /dev/null
+++ b/srclibs/HoloAccent.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/negusoft/holoaccent.git
+
+Subdir:HoloAccent
+
+Update Project:Yes
+
diff --git a/srclibs/HumanTime.txt b/srclibs/HumanTime.txt
new file mode 100644
index 0000000000..0253be64a6
--- /dev/null
+++ b/srclibs/HumanTime.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/headrevision/HumanTimeApproximation.git
diff --git a/srclibs/IOCipher.txt b/srclibs/IOCipher.txt
index 36ef4bf159..982f0a9a42 100644
--- a/srclibs/IOCipher.txt
+++ b/srclibs/IOCipher.txt
@@ -1,3 +1,4 @@
 Repo Type:git
 Repo:https://github.com/guardianproject/IOCipher.git
+Update Project:Yes
 
diff --git a/srclibs/ImageLoader-Novoda.txt b/srclibs/ImageLoader-Novoda.txt
new file mode 100644
index 0000000000..13dc1099ca
--- /dev/null
+++ b/srclibs/ImageLoader-Novoda.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/novoda/ImageLoader
+Subdir:core
diff --git a/srclibs/ImageLoader.txt b/srclibs/ImageLoader.txt
index 1a0ad7b056..0397cab553 100644
--- a/srclibs/ImageLoader.txt
+++ b/srclibs/ImageLoader.txt
@@ -1,7 +1,7 @@
 Repo Type:git
 Repo:https://github.com/nostra13/Android-Universal-Image-Loader.git
 
-Subdir:library
+Subdir:UniversalImageLoader,library
 
 Update Project:Yes
 
diff --git a/srclibs/ImageViewTouch.txt b/srclibs/ImageViewTouch.txt
new file mode 100644
index 0000000000..16101d9838
--- /dev/null
+++ b/srclibs/ImageViewTouch.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/sephiroth74/ImageViewZoom
+
+Subdir:library
diff --git a/srclibs/Inputmethodcommon.txt b/srclibs/Inputmethodcommon.txt
new file mode 100644
index 0000000000..0290197b47
--- /dev/null
+++ b/srclibs/Inputmethodcommon.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://android.googlesource.com/platform/frameworks/opt/inputmethodcommon
diff --git a/srclibs/Jbox2d.txt b/srclibs/Jbox2d.txt
new file mode 100644
index 0000000000..de0769d787
--- /dev/null
+++ b/srclibs/Jbox2d.txt
@@ -0,0 +1,3 @@
+# Moving to github soon so just use svn
+Repo Type:svn
+Repo:http://jbox2d.googlecode.com/svn/tags/jbox2d-2.1.2.1/jbox2d-library
diff --git a/srclibs/ListViewAnimations.txt b/srclibs/ListViewAnimations.txt
new file mode 100644
index 0000000000..c8d595130f
--- /dev/null
+++ b/srclibs/ListViewAnimations.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/nhaarman/ListViewAnimations
+Subdir:library
diff --git a/srclibs/MenuComponent.txt b/srclibs/MenuComponent.txt
new file mode 100644
index 0000000000..f4e08c28bc
--- /dev/null
+++ b/srclibs/MenuComponent.txt
@@ -0,0 +1,8 @@
+Repo Type:git
+Repo:https://github.com/mariotaku/Android-MenuComponent.git
+
+Subdir:library
+
+Update Project:Yes
+
+
diff --git a/srclibs/MessageBar.txt b/srclibs/MessageBar.txt
new file mode 100644
index 0000000000..7539d7c7e8
--- /dev/null
+++ b/srclibs/MessageBar.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/MichaelFlisar/MessageBar.git
+
+Update Project:Yes
diff --git a/srclibs/Mini-WB.txt b/srclibs/Mini-WB.txt
index 217f4dcad8..8615f29e29 100644
--- a/srclibs/Mini-WB.txt
+++ b/srclibs/Mini-WB.txt
@@ -3,5 +3,3 @@ Repo:https://github.com/wbaumann/WBMiniLibrary
 
 Update Project:Yes
 
-Prepare:rm -rf bin gen
-
diff --git a/srclibs/NewQuickAction3D-haiwen.txt b/srclibs/NewQuickAction3D-haiwen.txt
new file mode 100644
index 0000000000..a17700f4cb
--- /dev/null
+++ b/srclibs/NewQuickAction3D-haiwen.txt
@@ -0,0 +1,5 @@
+Repo Type:git
+Repo:https://github.com/haiwen/NewQuickAction
+
+Update Project:Yes
+
diff --git a/srclibs/NoAnalytics.txt b/srclibs/NoAnalytics.txt
index 3bc8329207..d8f49d977e 100644
--- a/srclibs/NoAnalytics.txt
+++ b/srclibs/NoAnalytics.txt
@@ -3,7 +3,7 @@ Repo:https://github.com/mar-v-in/NoAnalytics.git
 
 Subdir:NoAnalytics
 
-Prepare:echo -e "android.library=true\ntarget=android-16\n" >> project.properties
+Prepare:[ -f project.properties ] || echo -e "android.library=true\ntarget=android-16\n" >> project.properties
 
 Update Project:Yes
 
diff --git a/srclibs/ONScripter.txt b/srclibs/ONScripter.txt
new file mode 100644
index 0000000000..f831f43e5a
--- /dev/null
+++ b/srclibs/ONScripter.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/shinohane/onscripter-versiontrack
diff --git a/srclibs/OpenTTD.txt b/srclibs/OpenTTD.txt
new file mode 100644
index 0000000000..770205c722
--- /dev/null
+++ b/srclibs/OpenTTD.txt
@@ -0,0 +1,2 @@
+Repo Type:git-svn
+Repo:svn://svn.openttd.org;trunk=trunk;tags=tags
diff --git a/srclibs/ProgressFragment.txt b/srclibs/ProgressFragment.txt
new file mode 100644
index 0000000000..b52c9f7d9d
--- /dev/null
+++ b/srclibs/ProgressFragment.txt
@@ -0,0 +1,5 @@
+Repo Type:git
+Repo:https://github.com/johnkil/Android-ProgressFragment
+Subdir:progressfragment
+Prepare:mkdir libs
+Update Project:Yes
diff --git a/srclibs/Protobuf.txt b/srclibs/Protobuf.txt
new file mode 100644
index 0000000000..21ae98cb93
--- /dev/null
+++ b/srclibs/Protobuf.txt
@@ -0,0 +1,4 @@
+Repo Type:git-svn
+Repo:http://protobuf.googlecode.com/svn;trunk=trunk;tags=tags
+
+Subdir:java
diff --git a/srclibs/RootFW.txt b/srclibs/RootFW.txt
new file mode 100644
index 0000000000..1b3f6983a6
--- /dev/null
+++ b/srclibs/RootFW.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/SpazeDog/rootfw
+Update Project:Yes
diff --git a/srclibs/SherlockNavDrawer.txt b/srclibs/SherlockNavDrawer.txt
new file mode 100644
index 0000000000..64bf5aa4af
--- /dev/null
+++ b/srclibs/SherlockNavDrawer.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/nicolasjafelle/SherlockNavigationDrawer
+Subdir:SherlockNavigationDrawer
+Prepare:sed -i '/ActionBarSherlock/d' project.properties && $$SDK$$/tools/android update project -p . -l ../../ActionBarSherlock/actionbarsherlock
diff --git a/srclibs/ShowcaseView.txt b/srclibs/ShowcaseView.txt
new file mode 100644
index 0000000000..27a2ef6061
--- /dev/null
+++ b/srclibs/ShowcaseView.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/Espiandev/ShowcaseView.git
+
+Subdir:library
+
+Prepare:$$SDK$$/tools/android update project -l ../../NineOldAndroids/library -p .
+
diff --git a/srclibs/SmartReceipts.txt b/srclibs/SmartReceipts.txt
index 74c550853f..dd1195847f 100644
--- a/srclibs/SmartReceipts.txt
+++ b/srclibs/SmartReceipts.txt
@@ -3,4 +3,4 @@ Repo:https://github.com/wbaumann/Smart-Receipts
 
 Update Project:Yes
 
-Prepare:rm -rf bin gen && sed -i 's@\(android.library.reference.1=\).*@\1../Mini-WB@;s@\(android.library.reference.2=\).*@\1../ActionBarSherlock/library@;s@\(android.library.reference.3=\).*@\1../AndroidCamera-WB@' project.properties
+Srclibs:Mini-WB,ActionBarSherlock,AndroidCamera-WB
diff --git a/srclibs/Smashwords-API.txt b/srclibs/Smashwords-API.txt
new file mode 100644
index 0000000000..940a5a7215
--- /dev/null
+++ b/srclibs/Smashwords-API.txt
@@ -0,0 +1,3 @@
+Repo Type:git-svn
+Repo:http://smashwordsapi.googlecode.com/svn/trunk
+Subdir:SmashwordsAPI
diff --git a/srclibs/SmoothProgressBar.txt b/srclibs/SmoothProgressBar.txt
new file mode 100644
index 0000000000..e887f17b93
--- /dev/null
+++ b/srclibs/SmoothProgressBar.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/castorflex/SmoothProgressBar.git
+
+Subdir:library/src/main
+Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\ntarget=android-19' > project.properties
+Update Project:Yes
+
diff --git a/srclibs/Sonic.txt b/srclibs/Sonic.txt
new file mode 100644
index 0000000000..747421c0ae
--- /dev/null
+++ b/srclibs/Sonic.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/waywardgeek/sonic-ndk
diff --git a/srclibs/StickyListHeaders.txt b/srclibs/StickyListHeaders.txt
new file mode 100644
index 0000000000..f89fd54d09
--- /dev/null
+++ b/srclibs/StickyListHeaders.txt
@@ -0,0 +1,5 @@
+Repo Type:git
+Repo:https://github.com/emilsjolander/StickyListHeaders.git
+Subdir:library
+Update Project:Yes
+
diff --git a/srclibs/SuperDryColorPicker.txt b/srclibs/SuperDryColorPicker.txt
new file mode 100644
index 0000000000..f415f7975c
--- /dev/null
+++ b/srclibs/SuperDryColorPicker.txt
@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/superdry/SuperdryColorPickerLib
+Prepare:$$SDK$$/tools/android update project -p . -t android-10
diff --git a/srclibs/Support.txt b/srclibs/Support.txt
index 26bd70429a..1066f4588b 100644
--- a/srclibs/Support.txt
+++ b/srclibs/Support.txt
@@ -1,2 +1,7 @@
 Repo Type:git
 Repo:https://android.googlesource.com/platform/frameworks/support
+
+Update Project:Yes
+
+Prepare:mkdir -p libs
+
diff --git a/srclibs/TaskManager.txt b/srclibs/TaskManager.txt
new file mode 100644
index 0000000000..39fef1b30b
--- /dev/null
+++ b/srclibs/TaskManager.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/SpazeDog/taskmanager
+Update Project:Yes
+Prepare:mkdir libs
diff --git a/srclibs/TtsSetup.txt b/srclibs/TtsSetup.txt
new file mode 100644
index 0000000000..a1457f8f01
--- /dev/null
+++ b/srclibs/TtsSetup.txt
@@ -0,0 +1,4 @@
+Repo Type:git
+Repo:https://github.com/gregko/TtsSetup_Java.git
+
+Update Project:Yes
diff --git a/srclibs/VoiceIME.txt b/srclibs/VoiceIME.txt
new file mode 100644
index 0000000000..a468aef512
--- /dev/null
+++ b/srclibs/VoiceIME.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://code.google.com/p/google-voice-typing-integration/
+
+Subdir:VoiceImeUtils
+Update Project:Yes
+
+
diff --git a/srclibs/Volley.txt b/srclibs/Volley.txt
index ffe6c23dea..13e3aaab83 100644
--- a/srclibs/Volley.txt
+++ b/srclibs/Volley.txt
@@ -1,4 +1,5 @@
 Repo Type:git
 Repo:https://android.googlesource.com/platform/frameworks/volley
 
+Prepare:rm -rf tests/ && echo "android.library=true" >> project.properties
 Update Project:Yes
diff --git a/srclibs/WeatherNotification.txt b/srclibs/WeatherNotification.txt
new file mode 100644
index 0000000000..efdb5cda91
--- /dev/null
+++ b/srclibs/WeatherNotification.txt
@@ -0,0 +1,2 @@
+Repo Type:hg
+Repo:https://code.google.com/p/weather-notification-android/
diff --git a/srclibs/Xmp.txt b/srclibs/Xmp.txt
new file mode 100644
index 0000000000..7c08fa30cb
--- /dev/null
+++ b/srclibs/Xmp.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://android.googlesource.com/platform/external/xmp_toolkit
diff --git a/srclibs/appcompat.txt b/srclibs/appcompat.txt
new file mode 100644
index 0000000000..2c6d366ca9
--- /dev/null
+++ b/srclibs/appcompat.txt
@@ -0,0 +1,5 @@
+
+Repo Type:git
+Repo:https://git.gitorious.org/f-droid-mirrors/appcompat.git
+
+Update Project:Yes
diff --git a/srclibs/drag-sort-listview.txt b/srclibs/drag-sort-listview.txt
new file mode 100644
index 0000000000..62449f3f57
--- /dev/null
+++ b/srclibs/drag-sort-listview.txt
@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/bauerca/drag-sort-listview.git
+
+Subdir:library
+
+Update Project:Yes
+
diff --git a/srclibs/protobuf.txt b/srclibs/protobuf.txt
new file mode 100644
index 0000000000..bfc9b1af43
--- /dev/null
+++ b/srclibs/protobuf.txt
@@ -0,0 +1,5 @@
+Repo Type:git
+Repo:https://code.google.com/p/clementine-remote-android.dep-protocolbuffer/
+
+Update Project:No
+
diff --git a/stats/antifeatures.txt b/stats/antifeatures.txt
new file mode 100644
index 0000000000..34aab22610
--- /dev/null
+++ b/stats/antifeatures.txt
@@ -0,0 +1,6 @@
+UpstreamNonFree 52
+Tracking 15
+Ads 1
+NonFreeAdd 6
+NonFreeDep 10
+NonFreeNet 7
diff --git a/stats/categories.txt b/stats/categories.txt
new file mode 100644
index 0000000000..d76d68c639
--- /dev/null
+++ b/stats/categories.txt
@@ -0,0 +1,14 @@
+Development 33
+Phone & SMS 28
+Wallpaper 45
+Office 214
+Science & Education 61
+Multimedia 111
+System 214
+Games 130
+Internet 134
+None 3
+Mathematics 1
+Reading 38
+Navigation 83
+Children 3
diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index e7169faf92..b51eb70d48 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -136,6 +136,9 @@ XWords4_android_beta_18.apk org.eehouse.android.xw4 2010-11-21
 a2dp.Vol_101.apk a2dp.Vol 2013-01-02
 a2dp.Vol_104.apk a2dp.Vol 2013-01-22
 a2dp.Vol_107.apk a2dp.Vol 2013-05-09
+a2dp.Vol_111.apk a2dp.Vol 2013-10-29
+a2dp.Vol_114.apk a2dp.Vol 2013-12-13
+a2dp.Vol_120.apk a2dp.Vol 2014-01-14
 a2dp.Vol_93.apk a2dp.Vol 2012-08-23
 a2dp.Vol_96.apk a2dp.Vol 2012-12-03
 a2dp.Vol_99.apk a2dp.Vol 2013-01-09
@@ -148,12 +151,14 @@ aarddict.android_18.apk aarddict.android 2013-03-04
 aarddict.android_19.apk aarddict.android 2013-04-04
 aarddict.android_20.apk aarddict.android 2013-05-28
 aarddict.android_21.apk aarddict.android 2013-07-28
+aarddict.android_22.apk aarddict.android 2013-11-10
 acr.browser.barebones_22.apk acr.browser.barebones 2013-03-02
 acr.browser.barebones_27.apk acr.browser.barebones 2013-03-27
 acr.browser.barebones_30.apk acr.browser.barebones 2013-04-04
 acr.browser.barebones_36.apk acr.browser.barebones 2013-04-07
 acr.browser.barebones_37.apk acr.browser.barebones 2013-04-11
 acr.browser.barebones_42.apk acr.browser.barebones 2013-04-28
+acr.browser.barebones_60.apk acr.browser.barebones 2013-11-05
 alogcat-2.1.4.apk org.jtb.alogcat 2010-11-21
 am.ed.importcontacts_10301.apk am.ed.importcontacts 2013-02-28
 am.ed.importcontacts_10303.apk am.ed.importcontacts 2013-09-09
@@ -163,6 +168,7 @@ android.androidVNC_13.apk android.androidVNC 2011-04-06
 android.game.prboom_31.apk android.game.prboom 2012-03-10
 android.tether_26.apk android.tether 2012-07-26
 androidVNC_build20100725.apk android.androidVNC 2010-11-18
+app.openconnect_1.apk app.openconnect 2014-01-07
 apps.babycaretimer_5.apk apps.babycaretimer 2012-09-18
 apps.babycaretimer_6.apk apps.babycaretimer 2012-08-23
 apps.droidnotify_27.apk apps.droidnotify 2012-01-21
@@ -178,9 +184,24 @@ apps.droidnotify_59.apk apps.droidnotify 2012-11-03
 apps.droidnotify_64.apk apps.droidnotify 2013-01-02
 apps.droidnotify_67.apk apps.droidnotify 2013-04-08
 arity.calculator_27.apk arity.calculator 2012-02-11
+at.bitfire.davdroid_10.apk at.bitfire.davdroid 2013-10-31
+at.bitfire.davdroid_11.apk at.bitfire.davdroid 2013-11-02
+at.bitfire.davdroid_12.apk at.bitfire.davdroid 2013-11-10
+at.bitfire.davdroid_13.apk at.bitfire.davdroid 2013-11-16
+at.bitfire.davdroid_14.apk at.bitfire.davdroid 2013-11-17
+at.bitfire.davdroid_15.apk at.bitfire.davdroid 2013-11-22
+at.bitfire.davdroid_16.apk at.bitfire.davdroid 2013-11-24
+at.bitfire.davdroid_17.apk at.bitfire.davdroid 2013-12-01
+at.bitfire.davdroid_18.apk at.bitfire.davdroid 2013-12-07
+at.bitfire.davdroid_19.apk at.bitfire.davdroid 2013-12-09
+at.bitfire.davdroid_20.apk at.bitfire.davdroid 2013-12-12
+at.bitfire.davdroid_21.apk at.bitfire.davdroid 2013-12-16
+at.bitfire.davdroid_22.apk at.bitfire.davdroid 2013-12-27
+at.bitfire.davdroid_24.apk at.bitfire.davdroid 2014-01-07
 at.bitfire.davdroid_5.apk at.bitfire.davdroid 2013-10-13
 at.bitfire.davdroid_6.apk at.bitfire.davdroid 2013-10-16
 at.bitfire.davdroid_7.apk at.bitfire.davdroid 2013-10-21
+at.bitfire.davdroid_8.apk at.bitfire.davdroid 2013-10-27
 at.bitfire.gfxtablet_2.apk at.bitfire.gfxtablet 2013-07-17
 at.bitfire.gfxtablet_3.apk at.bitfire.gfxtablet 2013-10-13
 at.dasz.KolabDroid_94.apk at.dasz.KolabDroid 2013-08-23
@@ -202,12 +223,16 @@ au.com.darkside.XServer_11.apk au.com.darkside.XServer 2012-10-01
 au.com.darkside.XServer_12.apk au.com.darkside.XServer 2012-10-30
 au.com.darkside.XServer_13.apk au.com.darkside.XServer 2012-11-11
 au.com.darkside.XServer_14.apk au.com.darkside.XServer 2013-03-13
+au.com.darkside.XServer_15.apk au.com.darkside.XServer 2013-11-20
+au.com.darkside.XServer_16.apk au.com.darkside.XServer 2013-12-27
+au.com.darkside.XServer_17.apk au.com.darkside.XServer 2014-01-15
 au.com.darkside.XServer_2.apk au.com.darkside.XServer 2012-03-06
 au.com.darkside.XServer_9.apk au.com.darkside.XServer 2012-08-13
 aws.apps.androidDrawables_7.apk aws.apps.androidDrawables 2012-09-18
 aws.apps.androidDrawables_8.apk aws.apps.androidDrawables 2013-03-27
 aws.apps.usbDeviceEnumerator_5.apk aws.apps.usbDeviceEnumerator 2013-07-17
 bander.notepad_12.apk bander.notepad 2012-09-07
+be.norio.randomapp_1.apk be.norio.randomapp 2014-01-07
 be.ppareit.swiftp_free_21.apk be.ppareit.swiftp_free 2012-10-11
 be.ppareit.swiftp_free_23.apk be.ppareit.swiftp_free 2012-11-01
 be.ppareit.swiftp_free_25.apk be.ppareit.swiftp_free 2013-01-02
@@ -215,6 +240,7 @@ be.ppareit.swiftp_free_26.apk be.ppareit.swiftp_free 2013-02-25
 be.ppareit.swiftp_free_27.apk be.ppareit.swiftp_free 2013-05-16
 be.ppareit.swiftp_free_28.apk be.ppareit.swiftp_free 2013-08-10
 be.quentinloos.manille_1.apk be.quentinloos.manille 2013-08-27
+be.quentinloos.manille_2.apk be.quentinloos.manille 2013-11-17
 biz.codefuture.svgviewer_5.apk biz.codefuture.svgviewer 2013-06-24
 biz.gyrus.yaab_10.apk biz.gyrus.yaab 2012-11-26
 biz.gyrus.yaab_11.apk biz.gyrus.yaab 2012-12-03
@@ -222,16 +248,23 @@ biz.gyrus.yaab_14.apk biz.gyrus.yaab 2013-01-02
 biz.gyrus.yaab_17.apk biz.gyrus.yaab 2013-02-04
 biz.gyrus.yaab_19.apk biz.gyrus.yaab 2013-03-04
 biz.gyrus.yaab_20.apk biz.gyrus.yaab 2013-08-13
+biz.gyrus.yaab_21.apk biz.gyrus.yaab 2013-10-29
+biz.gyrus.yaab_22.apk biz.gyrus.yaab 2013-11-15
+biz.gyrus.yaab_23.apk biz.gyrus.yaab 2014-01-08
 budo.budoist_29.apk budo.budoist 2012-10-10
 budo.budoist_30.apk budo.budoist 2012-09-26
 budo.budoist_31.apk budo.budoist 2012-10-30
 budo.budoist_32.apk budo.budoist 2012-11-12
 budo.budoist_33.apk budo.budoist 2013-07-04
+buet.rafi.dictionary_5.apk buet.rafi.dictionary 2013-12-11
 bughunter2.smsfilter_1.apk bughunter2.smsfilter 2013-01-24
+bughunter2.smsfilter_2.apk bughunter2.smsfilter 2013-11-22
+ca.ddaly.android.heart_3.apk ca.ddaly.android.heart 2013-12-09
 caldwell.ben.bites_4.apk caldwell.ben.bites 2012-10-10
 caldwell.ben.trolly_6.apk caldwell.ben.trolly 2011-01-27
 campyre.android_7.apk campyre.android 2012-08-29
 cc.co.eurdev.urecorder_5.apk cc.co.eurdev.urecorder 2012-08-23
+cc.rainwave.android_4.apk cc.rainwave.android 2014-01-09
 cgeo.geocaching_20120618.apk cgeo.geocaching 2012-09-10
 cgeo.geocaching_20121203.apk cgeo.geocaching 2013-01-02
 cgeo.geocaching_20130110.apk cgeo.geocaching 2013-01-21
@@ -260,6 +293,7 @@ ch.fixme.cowsay_4.apk ch.fixme.cowsay 2012-10-10
 ch.fixme.status_10.apk ch.fixme.status 2013-06-10
 ch.fixme.status_14.apk ch.fixme.status 2013-09-06
 ch.fixme.status_15.apk ch.fixme.status 2013-09-20
+ch.fixme.status_16.apk ch.fixme.status 2013-10-28
 ch.nexuscomputing.android.osciprimeics_14.apk ch.nexuscomputing.android.osciprimeics 2013-07-08
 ch.rrelmy.android.batterymanager_3.apk ch.rrelmy.android.batterymanager 2012-08-29
 ch.rrelmy.android.locationcachemap_6.apk ch.rrelmy.android.locationcachemap 2012-09-07
@@ -267,7 +301,9 @@ cmupdaterapp.ui_501.apk cmupdaterapp.ui 2011-07-12
 com.FireFart.Permissions2_3.apk com.FireFart.Permissions2 2012-08-23
 com.FireFart.Permissions_2.apk com.FireFart.Permissions 2011-03-02
 com.MarcosDiez.shareviahttp_11.apk com.MarcosDiez.shareviahttp 2012-09-11
+com.MarcosDiez.shareviahttp_12.apk com.MarcosDiez.shareviahttp 2013-11-17
 com.abcdjdj.rootverifier_3.apk com.abcdjdj.rootverifier 2013-08-09
+com.abcdjdj.rootverifier_4.apk com.abcdjdj.rootverifier 2013-11-10
 com.achep.widget.jellyclock_2.apk com.achep.widget.jellyclock 2013-02-25
 com.achep.widget.jellyclock_6.apk com.achep.widget.jellyclock 2013-03-19
 com.adam.aslfms_30.apk com.adam.aslfms 2012-09-20
@@ -278,10 +314,12 @@ com.addi_40.apk com.addi 2012-02-25
 com.addi_44.apk com.addi 2012-05-12
 com.adstrosoftware.launchappops_1.apk com.adstrosoftware.launchappops 2013-08-29
 com.agiro.scanner.android_2.apk com.agiro.scanner.android 2011-01-27
+com.akop.bach_116.apk com.akop.bach 2013-12-11
 com.alfray.asqare_103.apk com.alfray.asqare 2012-07-26
 com.alfray.timeriffic_10903.apk com.alfray.timeriffic 2010-11-13
 com.alfray.timeriffic_10905.apk com.alfray.timeriffic 2011-01-31
 com.amphoras.tpthelper_24.apk com.amphoras.tpthelper 2012-08-29
+com.ancantus.HYPNOTOAD_4.apk com.ancantus.HYPNOTOAD 2013-12-15
 com.andrew.apollo_1.apk com.andrew.apollo 2013-03-18
 com.andrew.apollo_2.apk com.andrew.apollo 2013-05-09
 com.andrewshu.android.reddit_67.apk com.andrewshu.android.reddit 2011-01-15
@@ -293,6 +331,11 @@ com.andrewshu.android.reddit_73.apk com.andrewshu.android.reddit 2011-11-28
 com.andrewshu.android.reddit_75.apk com.andrewshu.android.reddit 2011-12-02
 com.andrewshu.android.reddit_76.apk com.andrewshu.android.reddit 2011-12-05
 com.andrewshu.android.reddit_83.apk com.andrewshu.android.reddit 2012-01-15
+com.android.camera2_1.apk com.android.camera2 2014-01-07
+com.android.inputmethod.latin_4421.apk com.android.inputmethod.latin 2014-01-16
+com.android.inputmethod.latin_4422.apk com.android.inputmethod.latin 2014-01-16
+com.android.inputmethod.latin_4423.apk com.android.inputmethod.latin 2014-01-16
+com.android.inputmethod.latin_4424.apk com.android.inputmethod.latin 2014-01-16
 com.android.inputmethod.norwegian_13.apk com.android.inputmethod.norwegian 2011-01-27
 com.android.inputmethod.norwegian_15.apk com.android.inputmethod.norwegian 2011-03-09
 com.android.keepass_111.apk com.android.keepass 2013-01-28
@@ -315,10 +358,12 @@ com.android.keepass_83.apk com.android.keepass 2011-12-31
 com.android.keepass_84.apk com.android.keepass 2012-01-19
 com.android.keepass_85.apk com.android.keepass 2012-01-24
 com.android.keepass_98.apk com.android.keepass 2012-10-16
+com.android.launcher3_1.apk com.android.launcher3 2013-12-09
 com.android.music_1.apk com.android.music 2013-06-24
 com.android.quake_1.apk com.android.quake 2013-01-02
 com.android.shellms_1.apk com.android.shellms 2013-04-25
 com.android.shellms_2.apk com.android.shellms 2013-07-11
+com.android.shellms_3.apk com.android.shellms 2013-11-13
 com.android2.calculator3_22.apk com.android2.calculator3 2012-11-13
 com.android2.calculator3_24.apk com.android2.calculator3 2012-11-13
 com.android2.calculator3_28.apk com.android2.calculator3 2012-12-22
@@ -337,6 +382,7 @@ com.andybotting.tramhunter_1000.apk com.andybotting.tramhunter 2012-09-07
 com.andybotting.tramhunter_1100.apk com.andybotting.tramhunter 2013-01-02
 com.andybotting.tramhunter_1200.apk com.andybotting.tramhunter 2013-05-10
 com.andybotting.tramhunter_1300.apk com.andybotting.tramhunter 2013-08-13
+com.angrydoughnuts.android.alarmclock_10.apk com.angrydoughnuts.android.alarmclock 2013-12-13
 com.angrydoughnuts.android.alarmclock_8.apk com.angrydoughnuts.android.alarmclock 2011-05-19
 com.anoshenko.android.mahjongg_14.apk com.anoshenko.android.mahjongg 2012-02-12
 com.anysoftkeyboard.languagepack.SSH_4.apk com.anysoftkeyboard.languagepack.SSH 2013-03-15
@@ -350,6 +396,7 @@ com.anysoftkeyboard.languagepack.greek_3.apk com.anysoftkeyboard.languagepack.gr
 com.anysoftkeyboard.languagepack.hebrew_large_10.apk com.anysoftkeyboard.languagepack.hebrew_large 2013-03-14
 com.anysoftkeyboard.languagepack.hungarian_12.apk com.anysoftkeyboard.languagepack.hungarian 2013-03-12
 com.anysoftkeyboard.languagepack.hungarian_15.apk com.anysoftkeyboard.languagepack.hungarian 2013-07-14
+com.anysoftkeyboard.languagepack.hungarian_16.apk com.anysoftkeyboard.languagepack.hungarian 2013-11-24
 com.anysoftkeyboard.languagepack.malayalam_2.apk com.anysoftkeyboard.languagepack.malayalam 2013-09-20
 com.anysoftkeyboard.languagepack.pali_2.apk com.anysoftkeyboard.languagepack.pali 2013-03-21
 com.anysoftkeyboard.languagepack.persian_4.apk com.anysoftkeyboard.languagepack.persian 2013-03-15
@@ -366,15 +413,20 @@ com.aripuca.tracker_20.apk com.aripuca.tracker 2013-04-05
 com.aripuca.tracker_22.apk com.aripuca.tracker 2013-04-18
 com.aripuca.tracker_24.apk com.aripuca.tracker 2013-07-04
 com.aripuca.tracker_26.apk com.aripuca.tracker 2013-09-20
+com.ariwilson.seismowallpaper_2.apk com.ariwilson.seismowallpaper 2013-12-09
 com.artifex.mupdfdemo_2.apk com.artifex.mupdfdemo 2013-04-08
 com.artifex.mupdfdemo_50.apk com.artifex.mupdfdemo 2013-06-30
 com.artifex.mupdfdemo_51.apk com.artifex.mupdfdemo 2013-06-30
 com.artifex.mupdfdemo_52.apk com.artifex.mupdfdemo 2013-06-30
 com.as.anagramsolver_10.apk com.as.anagramsolver 2013-10-11
+com.as.anagramsolver_11.apk com.as.anagramsolver 2013-11-06
+com.as.anagramsolver_12.apk com.as.anagramsolver 2013-11-22
+com.as.anagramsolver_13.apk com.as.anagramsolver 2013-12-27
 com.aselalee.trainschedule_115.apk com.aselalee.trainschedule 2012-10-30
 com.aselalee.trainschedule_116.apk com.aselalee.trainschedule 2013-05-09
 com.asksven.betterbatterystats_28.apk com.asksven.betterbatterystats 2013-06-04
 com.asksven.betterbatterystats_38.apk com.asksven.betterbatterystats 2013-06-04
+com.asksven.betterwifionoff_43.apk com.asksven.betterwifionoff 2013-12-09
 com.ath0.rpn_10.apk com.ath0.rpn 2012-02-11
 com.ath0.rpn_15.apk com.ath0.rpn 2012-07-26
 com.ath0.rpn_17.apk com.ath0.rpn 2012-10-11
@@ -390,6 +442,11 @@ com.axelby.podax_32.apk com.axelby.podax 2012-10-22
 com.axelby.podax_33.apk com.axelby.podax 2012-10-27
 com.axelby.podax_36.apk com.axelby.podax 2012-12-05
 com.axelby.podax_38.apk com.axelby.podax 2013-01-22
+com.axelby.podax_42.apk com.axelby.podax 2013-11-13
+com.axelby.podax_45.apk com.axelby.podax 2013-12-02
+com.axelby.podax_46.apk com.axelby.podax 2013-12-03
+com.axelby.podax_48.apk com.axelby.podax 2013-12-09
+com.axelby.podax_50.apk com.axelby.podax 2013-12-22
 com.banasiak.coinflip_25.apk com.banasiak.coinflip 2012-08-23
 com.banasiak.coinflip_26.apk com.banasiak.coinflip 2012-09-26
 com.banasiak.coinflip_27.apk com.banasiak.coinflip 2012-10-01
@@ -406,10 +463,13 @@ com.beem.project.beem_9.apk com.beem.project.beem 2012-01-10
 com.better.alarm_2414.apk com.better.alarm 2013-06-20
 com.better.alarm_2507.apk com.better.alarm 2013-08-19
 com.better.alarm_2509.apk com.better.alarm 2013-09-09
+com.blippex.app_5.apk com.blippex.app 2014-01-07
+com.blntsoft.emailpopup_14.apk com.blntsoft.emailpopup 2013-12-09
 com.blogspot.marioboehmer.nfcprofile_5.apk com.blogspot.marioboehmer.nfcprofile 2012-08-23
 com.blogspot.tonyatkins.freespeech_117.apk com.blogspot.tonyatkins.freespeech 2013-04-18
 com.blogspot.tonyatkins.freespeech_119.apk com.blogspot.tonyatkins.freespeech 2013-07-02
 com.blogspot.tonyatkins.freespeech_121.apk com.blogspot.tonyatkins.freespeech 2013-07-16
+com.blogspot.tonyatkins.freespeech_124.apk com.blogspot.tonyatkins.freespeech 2014-01-15
 com.boardgamegeek_20.apk com.boardgamegeek 2011-09-26
 com.boardgamegeek_21.apk com.boardgamegeek 2011-12-31
 com.boardgamegeek_23.apk com.boardgamegeek 2012-08-29
@@ -419,6 +479,10 @@ com.boombuler.games.shift_101.apk com.boombuler.games.shift 2012-09-15
 com.boombuler.widgets.contacts_102.apk com.boombuler.widgets.contacts 2013-03-02
 com.botbrew.basil_24.apk com.botbrew.basil 2013-03-06
 com.bottleworks.dailymoney_2012110700.apk com.bottleworks.dailymoney 2012-12-07
+com.bretternst.URLazy_2.apk com.bretternst.URLazy 2013-12-15
+com.brewcrewfoo.performance_3.apk com.brewcrewfoo.performance 2013-12-09
+com.brewcrewfoo.performance_4.apk com.brewcrewfoo.performance 2013-12-09
+com.bri1.soundbored_3.apk com.bri1.soundbored 2013-12-15
 com.brianco.colorclock_1.apk com.brianco.colorclock 2013-10-20
 com.brocktice.JustSit_17.apk com.brocktice.JustSit 2012-07-26
 com.brosmike.airpushdetector_10.apk com.brosmike.airpushdetector 2012-12-05
@@ -436,6 +500,9 @@ com.byagowi.persiancalendar_24.apk com.byagowi.persiancalendar 2013-01-28
 com.byagowi.persiancalendar_29.apk com.byagowi.persiancalendar 2013-02-25
 com.byagowi.persiancalendar_36.apk com.byagowi.persiancalendar 2013-04-09
 com.byagowi.persiancalendar_38.apk com.byagowi.persiancalendar 2013-06-04
+com.byagowi.persiancalendar_42.apk com.byagowi.persiancalendar 2013-10-27
+com.byagowi.persiancalendar_43.apk com.byagowi.persiancalendar 2013-11-10
+com.byagowi.persiancalendar_44.apk com.byagowi.persiancalendar 2013-12-13
 com.casimirlab.simpleDeadlines_10.apk com.casimirlab.simpleDeadlines 2013-03-26
 com.casimirlab.simpleDeadlines_12.apk com.casimirlab.simpleDeadlines 2013-05-20
 com.casimirlab.simpleDeadlines_14.apk com.casimirlab.simpleDeadlines 2013-09-03
@@ -448,10 +515,17 @@ com.ciarang.tallyphant_3.apk com.ciarang.tallyphant 2012-02-07
 com.ciarang.tallyphant_4.apk com.ciarang.tallyphant 2012-02-07
 com.ciarang.tallyphant_5.apk com.ciarang.tallyphant 2012-02-08
 com.codebutler.farebot_18.apk com.codebutler.farebot 2013-08-18
+com.coinbase.android_7.apk com.coinbase.android 2013-11-06
+com.coinbase.android_9.apk com.coinbase.android 2014-01-14
 com.colinmcdonough.android.torch_2.apk com.colinmcdonough.android.torch 2012-08-23
 com.colinmcdonough.android.torch_6.apk com.colinmcdonough.android.torch 2013-04-22
+com.color.colornamer_8.apk com.color.colornamer 2013-12-09
 com.commonsware.android.arXiv_106.apk com.commonsware.android.arXiv 2013-03-04
 com.commonsware.android.arXiv_92.apk com.commonsware.android.arXiv 2011-05-19
+com.concentricsky.android.khan_14.apk com.concentricsky.android.khan 2013-12-11
+com.corner23.android.beautyclocklivewallpaper_12.apk com.corner23.android.beautyclocklivewallpaper 2013-12-09
+com.cr5315.cfdc_17.apk com.cr5315.cfdc 2013-12-15
+com.cr5315.cfdc_18.apk com.cr5315.cfdc 2014-01-08
 com.cradle.iitc_mobile_13.apk com.cradle.iitc_mobile 2013-05-02
 com.cradle.iitc_mobile_14.apk com.cradle.iitc_mobile 2013-05-03
 com.cradle.iitc_mobile_18.apk com.cradle.iitc_mobile 2013-05-08
@@ -463,19 +537,33 @@ com.cradle.iitc_mobile_35.apk com.cradle.iitc_mobile 2013-08-13
 com.cradle.iitc_mobile_37.apk com.cradle.iitc_mobile 2013-08-20
 com.cradle.iitc_mobile_40.apk com.cradle.iitc_mobile 2013-09-20
 com.cradle.iitc_mobile_51.apk com.cradle.iitc_mobile 2013-10-03
+com.cradle.iitc_mobile_54.apk com.cradle.iitc_mobile 2013-11-03
+com.cradle.iitc_mobile_57.apk com.cradle.iitc_mobile 2013-11-03
+com.cradle.iitc_mobile_60.apk com.cradle.iitc_mobile 2013-11-22
+com.cradle.iitc_mobile_61.apk com.cradle.iitc_mobile 2013-12-02
+com.cradle.iitc_mobile_62.apk com.cradle.iitc_mobile 2013-12-30
 com.cyanogenmod.filemanager.ics_1014.apk com.cyanogenmod.filemanager.ics 2013-06-20
 com.cyanogenmod.filemanager.ics_1015.apk com.cyanogenmod.filemanager.ics 2013-07-19
+com.cybrosys.palmcalc_4.apk com.cybrosys.palmcalc 2013-12-11
 com.danga.squeezer_5.apk com.danga.squeezer 2011-03-02
+com.danielme.muspyforandroid_3.apk com.danielme.muspyforandroid 2013-12-09
 com.danvelazco.fbwrapper_20130520.apk com.danvelazco.fbwrapper 2013-06-13
 com.danvelazco.fbwrapper_20130702.apk com.danvelazco.fbwrapper 2013-07-04
 com.danvelazco.fbwrapper_20130726.apk com.danvelazco.fbwrapper 2013-08-09
+com.danvelazco.fbwrapper_20140104.apk com.danvelazco.fbwrapper 2014-01-04
+com.darknessmap_1.apk com.darknessmap 2013-12-09
+com.darshancomputing.BatteryIndicatorPro_11162.apk com.darshancomputing.BatteryIndicatorPro 2014-01-07
+com.dconstructing.cooper_2.apk com.dconstructing.cooper 2013-12-15
 com.debian.debiandroid_2.apk com.debian.debiandroid 2013-10-03
 com.digitallizard.nicecompass_6.apk com.digitallizard.nicecompass 2012-01-28
+com.dje.openwifinetworkremover_15.apk com.dje.openwifinetworkremover 2013-12-15
+com.dje.openwifinetworkremover_16.apk com.dje.openwifinetworkremover 2013-12-30
 com.dngames.mobilewebcam_118.apk com.dngames.mobilewebcam 2013-04-13
 com.dngames.mobilewebcam_87.apk com.dngames.mobilewebcam 2012-12-04
 com.dngames.mobilewebcam_90.apk com.dngames.mobilewebcam 2013-02-11
 com.dougkeen.bart_26.apk com.dougkeen.bart 2013-07-13
 com.dozingcatsoftware.asciicam_5.apk com.dozingcatsoftware.asciicam 2013-03-28
+com.dozingcatsoftware.asciicam_6.apk com.dozingcatsoftware.asciicam 2013-11-18
 com.dozingcatsoftware.bouncy_10.apk com.dozingcatsoftware.bouncy 2011-08-04
 com.dozingcatsoftware.bouncy_11.apk com.dozingcatsoftware.bouncy 2012-08-29
 com.dozingcatsoftware.bouncy_4.apk com.dozingcatsoftware.bouncy 2011-03-10
@@ -483,6 +571,8 @@ com.dozingcatsoftware.cameratimer_5.apk com.dozingcatsoftware.cameratimer 2013-0
 com.dozingcatsoftware.dodge_8.apk com.dozingcatsoftware.dodge 2012-08-23
 com.dozuki.ifixit_12.apk com.dozuki.ifixit 2013-03-23
 com.dozuki.ifixit_14.apk com.dozuki.ifixit 2013-04-08
+com.dozuki.ifixit_37.apk com.dozuki.ifixit 2013-10-29
+com.dozuki.ifixit_45.apk com.dozuki.ifixit 2014-01-16
 com.dozuki.ifixit_7.apk com.dozuki.ifixit 2012-10-10
 com.dozuki.ifixit_9.apk com.dozuki.ifixit 2012-10-31
 com.dririan.RingyDingyDingy_5.apk com.dririan.RingyDingyDingy 2012-08-10
@@ -496,6 +586,9 @@ com.dririan.RingyDingyDingy_705.apk com.dririan.RingyDingyDingy 2013-07-02
 com.drismo_17.apk com.drismo 2012-08-23
 com.drodin.tuxrider_11.apk com.drodin.tuxrider 2012-11-07
 com.droidwave.offlinecalendar_1.apk com.droidwave.offlinecalendar 2012-09-08
+com.duckduckgo.mobile.android_52.apk com.duckduckgo.mobile.android 2013-12-15
+com.duckduckgo.mobile.android_53.apk com.duckduckgo.mobile.android 2013-12-22
+com.dwak.lastcall_8.apk com.dwak.lastcall 2014-01-07
 com.dwalkes.android.toggleheadset2_11.apk com.dwalkes.android.toggleheadset2 2012-09-09
 com.eddyspace.networkmonitor_2.apk com.eddyspace.networkmonitor 2011-01-23
 com.eleybourn.bookcatalogue_124.apk com.eleybourn.bookcatalogue 2012-11-12
@@ -514,14 +607,20 @@ com.eleybourn.bookcatalogue_69.apk com.eleybourn.bookcatalogue 2011-11-21
 com.eleybourn.bookcatalogue_70.apk com.eleybourn.bookcatalogue 2011-12-31
 com.elsdoerfer.android.autostarts_22.apk com.elsdoerfer.android.autostarts 2013-04-08
 com.elsdoerfer.android.autostarts_24.apk com.elsdoerfer.android.autostarts 2013-01-02
+com.elsdoerfer.android.autostarts_25.apk com.elsdoerfer.android.autostarts 2013-11-22
+com.elsdoerfer.android.autostarts_26.apk com.elsdoerfer.android.autostarts 2013-12-02
+com.elsewhat.android.currentwallpaper_2.apk com.elsewhat.android.currentwallpaper 2013-12-15
 com.eolwral.osmonitor_28.apk com.eolwral.osmonitor 2012-08-09
 com.eolwral.osmonitor_41.apk com.eolwral.osmonitor 2013-06-04
 com.eolwral.osmonitor_42.apk com.eolwral.osmonitor 2013-07-05
 com.eolwral.osmonitor_43.apk com.eolwral.osmonitor 2013-09-06
 com.eolwral.osmonitor_48.apk com.eolwral.osmonitor 2013-10-04
+com.eolwral.osmonitor_50.apk com.eolwral.osmonitor 2013-10-29
+com.eolwral.osmonitor_53.apk com.eolwral.osmonitor 2014-01-14
 com.episode6.android.appalarm.lite_30.apk com.episode6.android.appalarm.pro 2012-01-11
 com.episode6.android.appalarm.pro_30.apk com.episode6.android.appalarm.pro 2012-08-23
 com.episode6.android.appalarm.pro_31.apk com.episode6.android.appalarm.pro 2012-09-12
+com.euedge.openaviationmap.android_16.apk com.euedge.openaviationmap.android 2013-12-11
 com.evancharlton.mileage_3000.apk com.evancharlton.mileage 2011-05-10
 com.evancharlton.mileage_3080.apk com.evancharlton.mileage 2012-01-17
 com.evancharlton.mileage_3100.apk com.evancharlton.mileage 2012-04-23
@@ -537,7 +636,11 @@ com.f2prateek.dfg_101.apk com.f2prateek.dfg 2013-04-22
 com.f2prateek.dfg_107.apk com.f2prateek.dfg 2013-09-09
 com.f2prateek.dfg_110.apk com.f2prateek.dfg 2013-09-23
 com.f2prateek.dfg_112.apk com.f2prateek.dfg 2013-10-01
+com.f2prateek.dfg_113.apk com.f2prateek.dfg 2013-11-05
+com.falconware.prestissimo_10.apk com.falconware.prestissimo 2013-12-09
+com.fgrim.msnake_7.apk com.fgrim.msnake 2013-10-29
 com.fivasim.antikythera_5.apk com.fivasim.antikythera 2012-09-07
+com.frankcalise.h2droid_10.apk com.frankcalise.h2droid 2013-12-09
 com.frostwire.android_75.apk com.frostwire.android 2012-12-22
 com.frostwire.android_81.apk com.frostwire.android 2012-12-22
 com.frostwire.android_85.apk com.frostwire.android 2013-04-22
@@ -556,7 +659,9 @@ com.gelakinetic.mtgfam_15.apk com.gelakinetic.mtgfam 2012-08-29
 com.gelakinetic.mtgfam_20.apk com.gelakinetic.mtgfam 2013-06-04
 com.gh4a_32.apk com.gh4a 2012-09-20
 com.ghostsq.commander.samba_51.apk com.ghostsq.commander.samba 2013-10-23
+com.ghostsq.commander.samba_52.apk com.ghostsq.commander.samba 2013-11-05
 com.ghostsq.commander.sftp_11.apk com.ghostsq.commander.sftp 2013-10-23
+com.ghostsq.commander.sftp_12.apk com.ghostsq.commander.sftp 2013-11-11
 com.ghostsq.commander_110.apk com.ghostsq.commander 2011-05-18
 com.ghostsq.commander_160.apk com.ghostsq.commander 2012-01-24
 com.ghostsq.commander_163.apk com.ghostsq.commander 2012-02-06
@@ -564,27 +669,39 @@ com.ghostsq.commander_164.apk com.ghostsq.commander 2012-02-15
 com.ghostsq.commander_210.apk com.ghostsq.commander 2013-03-28
 com.ghostsq.commander_214.apk com.ghostsq.commander 2013-10-23
 com.ghostsq.commander_219.apk com.ghostsq.commander 2013-10-23
+com.ghostsq.commander_223.apk com.ghostsq.commander 2013-11-05
+com.ghostsq.commander_224.apk com.ghostsq.commander 2013-11-19
 com.ghostsq.commander_94.apk com.ghostsq.commander 2011-04-02
 com.ghostsq.commander_97.apk com.ghostsq.commander 2011-04-02
 com.gimranov.zandy.app_1370.apk com.gimranov.zandy.app 2013-07-04
 com.gimranov.zandy.app_20.apk com.gimranov.zandy.app 2012-11-05
 com.ginkel.hashit_24.apk com.ginkel.hashit 2013-10-21
+com.github.alijc.cricketsalarm_2.apk com.github.alijc.cricketsalarm 2013-11-22
 com.github.andlyticsproject_226.apk com.github.andlyticsproject 2013-03-14
 com.github.andlyticsproject_228.apk com.github.andlyticsproject 2013-04-29
 com.github.andlyticsproject_233.apk com.github.andlyticsproject 2013-07-04
 com.github.andlyticsproject_238.apk com.github.andlyticsproject 2013-09-05
+com.github.cetoolbox_1.apk com.github.cetoolbox 2013-12-09
 com.github.egonw.isotopes_2.apk com.github.egonw.isotopes 2013-10-24
+com.github.grimpy.botifier_14.apk com.github.grimpy.botifier 2013-12-11
 com.github.mobile_1000.apk com.github.mobile 2012-09-20
 com.github.mobile_1100.apk com.github.mobile 2012-09-27
 com.github.mobile_1300.apk com.github.mobile 2013-03-07
 com.github.mobile_1400.apk com.github.mobile 2013-08-15
 com.github.mobile_1500.apk com.github.mobile 2013-08-29
 com.github.mobile_1700.apk com.github.mobile 2013-10-24
+com.github.mobile_1800.apk com.github.mobile 2013-11-13
 com.github.mobile_600.apk com.github.mobile 2012-08-13
 com.github.mobile_700.apk com.github.mobile 2012-08-26
 com.github.mobile_900.apk com.github.mobile 2012-09-12
+com.github.nicolassmith.urlevaluator_12.apk com.github.nicolassmith.urlevaluator 2014-01-12
+com.github.nicolassmith.urlevaluator_9.apk com.github.nicolassmith.urlevaluator 2013-12-15
 com.github.nutomic.controldlna_1.apk com.github.nutomic.controldlna 2013-06-27
 com.github.nutomic.controldlna_3.apk com.github.nutomic.controldlna 2013-07-22
+com.github.nutomic.controldlna_8.apk com.github.nutomic.controldlna 2014-01-11
+com.github.ruleant.getback_gps_11.apk com.github.ruleant.getback_gps 2013-12-10
+com.github.ruleant.getback_gps_12.apk com.github.ruleant.getback_gps 2013-12-10
+com.github.wdkapps.fillup_13.apk com.github.wdkapps.fillup 2013-12-09
 com.glTron_4.apk com.glTron 2012-07-26
 com.gladis.tictactoe_1.apk com.gladis.tictactoe 2013-03-25
 com.gluegadget.hndroid_3.apk com.gluegadget.hndroid 2012-08-23
@@ -601,10 +718,13 @@ com.google.android.diskusage_3010.apk com.google.android.diskusage 2011-08-09
 com.google.android.diskusage_3020.apk com.google.android.diskusage 2011-12-08
 com.google.android.diskusage_3021.apk com.google.android.diskusage 2012-04-24
 com.google.android.diskusage_3040.apk com.google.android.diskusage 2013-01-29
+com.google.android.diskusage_3042.apk com.google.android.diskusage 2013-11-13
 com.google.android.maps.mytracks_23.apk com.google.android.maps.mytracks 2011-02-11
 com.google.android.marvin.talkback_68.apk com.google.android.marvin.talkback 2013-05-09
 com.google.android.marvin.talkback_83.apk com.google.android.marvin.talkback 2013-04-24
 com.google.android.stardroid_1112.apk com.google.android.stardroid 2012-01-21
+com.google.android.stardroid_1113.apk com.google.android.stardroid 2013-11-04
+com.google.code.apps2org_200.apk com.google.code.apps2org 2013-11-23
 com.google.code.appsorganizer_162.apk com.google.code.appsorganizer 2011-01-27
 com.google.code.appsorganizer_163.apk com.google.code.appsorganizer 2011-02-13
 com.google.code.appsorganizer_164.apk com.google.code.appsorganizer 2011-04-19
@@ -615,6 +735,7 @@ com.google.zxing.client.android_87.apk com.google.zxing.client.android 2012-10-0
 com.google.zxing.client.android_91.apk com.google.zxing.client.android 2013-06-27
 com.google.zxing.client.android_93.apk com.google.zxing.client.android 2013-09-03
 com.google.zxing.client.android_94.apk com.google.zxing.client.android 2013-09-09
+com.google.zxing.client.android_95.apk com.google.zxing.client.android 2013-12-23
 com.googlecode.android.wifi.tether_38.apk com.googlecode.android.wifi.tether 2012-10-16
 com.googlecode.androidcells_1.apk com.googlecode.androidcells 2011-07-06
 com.googlecode.androidcells_9.apk com.googlecode.androidcells 2011-07-12
@@ -626,6 +747,8 @@ com.googlecode.droidwall_148.apk com.googlecode.droidwall 2011-02-10
 com.googlecode.droidwall_153.apk com.googlecode.droidwall 2011-10-03
 com.googlecode.droidwall_156.apk com.googlecode.droidwall 2011-12-11
 com.googlecode.droidwall_157.apk com.googlecode.droidwall 2013-05-10
+com.googlecode.eyesfree.espeak_7.apk com.googlecode.eyesfree.espeak 2014-01-02
+com.googlecode.gogodroid_13.apk com.googlecode.gogodroid 2014-01-03
 com.googlecode.gtalksms_64.apk com.googlecode.gtalksms 2012-10-26
 com.googlecode.gtalksms_66.apk com.googlecode.gtalksms 2013-02-04
 com.googlecode.gtalksms_69.apk com.googlecode.gtalksms 2013-09-30
@@ -649,6 +772,7 @@ com.googlecode.networklog_21700.apk com.googlecode.networklog 2013-04-13
 com.googlecode.networklog_21800.apk com.googlecode.networklog 2013-05-01
 com.googlecode.networklog_22000.apk com.googlecode.networklog 2013-10-01
 com.googlecode.networklog_22001.apk com.googlecode.networklog 2013-10-06
+com.googlecode.networklog_22100.apk com.googlecode.networklog 2013-11-22
 com.googlecode.openwnn.legacy_133.apk com.googlecode.openwnn.legacy 2012-11-26
 com.googlecode.tcime_113.apk com.googlecode.tcime 2012-11-30
 com.gpl.rpg.AndorsTrail_20.apk com.gpl.rpg.AndorsTrail 2011-10-02
@@ -657,6 +781,7 @@ com.gpl.rpg.AndorsTrail_29.apk com.gpl.rpg.AndorsTrail 2012-06-15
 com.gpl.rpg.AndorsTrail_33.apk com.gpl.rpg.AndorsTrail 2012-10-30
 com.gpl.rpg.AndorsTrail_39.apk com.gpl.rpg.AndorsTrail 2013-08-03
 com.gpstether_3.apk com.gpstether 2012-09-07
+com.gracecode.android.presentation_20131114.apk com.gracecode.android.presentation 2014-01-07
 com.grapefruitopia.dashclock.k9_1101.apk com.grapefruitopia.dashclock.k9 2013-02-28
 com.grapefruitopia.dashclock.k9_1110.apk com.grapefruitopia.dashclock.k9 2013-03-08
 com.gs.mobileprint_1.apk com.gs.mobileprint 2012-08-23
@@ -671,12 +796,14 @@ com.hermit.btreprap_3.apk com.hermit.btreprap 2012-04-10
 com.hexad.bluezime.hidenabler_1.apk com.hexad.bluezime.hidenabler 2012-11-08
 com.hexad.bluezime_17.apk com.hexad.bluezime 2012-08-23
 com.hobbyone.HashDroid_18.apk com.hobbyone.HashDroid 2013-07-09
+com.htruong.inputmethod.latin_6.apk com.htruong.inputmethod.latin 2014-01-07
 com.hughes.android.dictionary_15.apk com.hughes.android.dictionary 2012-01-29
 com.hughes.android.dictionary_16.apk com.hughes.android.dictionary 2012-02-04
 com.hughes.android.dictionary_18.apk com.hughes.android.dictionary 2012-03-17
 com.hughes.android.dictionary_19.apk com.hughes.android.dictionary 2012-04-02
 com.hughes.android.dictionary_21.apk com.hughes.android.dictionary 2012-05-28
 com.hughes.android.dictionary_23.apk com.hughes.android.dictionary 2013-03-04
+com.hughes.android.dictionary_25.apk com.hughes.android.dictionary 2013-12-29
 com.hyperionics.fbreader.plugin.tts_plus_1050090.apk com.hyperionics.fbreader.plugin.tts_plus 2012-09-10
 com.hyperionics.fbreader.plugin.tts_plus_1060000.apk com.hyperionics.fbreader.plugin.tts_plus 2012-09-28
 com.hyperionics.fbreader.plugin.tts_plus_1060010.apk com.hyperionics.fbreader.plugin.tts_plus 2012-10-11
@@ -701,11 +828,14 @@ com.ichi2.anki_26.apk com.ichi2.anki 2012-05-08
 com.ichi2.anki_29.apk com.ichi2.anki 2012-06-27
 com.ichi2.anki_30.apk com.ichi2.anki 2013-01-21
 com.ichi2.anki_32.apk com.ichi2.anki 2013-04-30
+com.ichi2.anki_40.apk com.ichi2.anki 2013-12-27
+com.ichi2.anki_43.apk com.ichi2.anki 2014-01-15
 com.ideasfrombrain.search_based_launcher_v2_5.apk com.ideasfrombrain.search_based_launcher_v2 2013-03-04
 com.ihunda.android.binauralbeat_24.apk com.ihunda.android.binauralbeat 2012-02-11
 com.ihunda.android.binauralbeat_39.apk com.ihunda.android.binauralbeat 2012-10-11
 com.integralblue.callerid_7.apk com.integralblue.callerid 2013-03-07
 com.intervigil.micdroid_34.apk com.intervigil.micdroid 2013-06-20
+com.intrications.android.sharebrowser_2.apk com.intrications.android.sharebrowser 2014-01-07
 com.irahul.worldclock_2.apk com.irahul.worldclock 2012-08-29
 com.ivanvolosyuk.sharetobrowser_7.apk com.ivanvolosyuk.sharetobrowser 2012-09-07
 com.jadn.cc_129.apk com.jadn.cc 2012-01-07
@@ -714,6 +844,7 @@ com.jadn.cc_154.apk com.jadn.cc 2013-08-12
 com.jakebasile.android.hearingsaver_12.apk com.jakebasile.android.hearingsaver 2012-08-23
 com.jakebasile.android.hearingsaver_13.apk com.jakebasile.android.hearingsaver 2012-09-18
 com.java.SmokeReducer_1.apk com.java.SmokeReducer 2012-08-24
+com.jaygoel.virginminuteschecker_13.apk com.jaygoel.virginminuteschecker 2013-12-09
 com.jecelyin.editor_32.apk com.jecelyin.editor 2012-08-23
 com.jecelyin.editor_33.apk com.jecelyin.editor 2012-09-26
 com.jecelyin.editor_39.apk com.jecelyin.editor 2012-12-05
@@ -722,6 +853,9 @@ com.jlyr_1.apk com.jlyr 2012-08-23
 com.jlyr_20.apk com.jlyr 2012-09-26
 com.jlyr_28.apk com.jlyr 2012-11-26
 com.jlyr_36.apk com.jlyr 2013-05-28
+com.jmartin.temaki_11.apk com.jmartin.temaki 2013-12-11
+com.jonglen7.jugglinglab_3.apk com.jonglen7.jugglinglab 2013-12-15
+com.jonglen7.jugglinglab_4.apk com.jonglen7.jugglinglab 2014-01-08
 com.jotabout.screeninfo.Screeninfo_103.apk com.jotabout.screeninfo 2012-07-05
 com.jotabout.screeninfo_103.apk com.jotabout.screeninfo 2012-08-29
 com.jotabout.screeninfo_106.apk com.jotabout.screeninfo 2013-02-11
@@ -730,19 +864,24 @@ com.jpkrause.c_feed_4.apk com.jpkrause.c_feed 2013-04-30
 com.jpkrause.c_feed_7.apk com.jpkrause.c_feed 2013-06-04
 com.jpkrause.c_feed_8.apk com.jpkrause.c_feed 2013-06-17
 com.jwetherell.heart_rate_monitor_1.apk com.jwetherell.heart_rate_monitor 2013-05-29
+com.kaeruct.glxy_1.apk com.kaeruct.glxy 2013-10-31
 com.kai1973i_4.apk com.kai1973i 2012-08-29
 com.kibab.android.EncPassChanger_1.apk com.kibab.android.EncPassChanger 2012-10-09
 com.kibab.android.EncPassChanger_2.apk com.kibab.android.EncPassChanger 2013-01-29
 com.kkinder.charmap_101.apk com.kkinder.charmap 2012-11-26
 com.kkinder.sharelocation_141.apk com.kkinder.sharelocation 2012-08-23
 com.kmagic.solitaire_450.apk com.kmagic.solitaire 2011-01-23
+com.knirirr.beecount_47.apk com.knirirr.beecount 2013-12-18
+com.knirirr.beecount_48.apk com.knirirr.beecount 2014-01-08
 com.kostmo.wallpaper.spiral_12.apk com.kostmo.wallpaper.spiral 2012-03-23
 com.kostmo.wallpaper.spiral_13.apk com.kostmo.wallpaper.spiral 2012-08-23
 com.kpz.pomodorotasks.activity_7.apk com.kpz.pomodorotasks.activity 2012-08-28
 com.kpz.pomodorotasks.activity_8.apk com.kpz.pomodorotasks.activity 2012-08-28
 com.kvance.Nectroid_10.apk com.kvance.Nectroid 2012-09-30
 com.kvance.Nectroid_11.apk com.kvance.Nectroid 2012-10-22
+com.kyakujin.android.tagnotepad_3.apk com.kyakujin.android.tagnotepad 2013-12-15
 com.leafdigital.kanji.android_2.apk com.leafdigital.kanji.android 2012-10-30
+com.lecz.android.tiltmazes_3.apk com.lecz.android.tiltmazes 2013-11-13
 com.leinardi.kitchentimer_116.apk com.leinardi.kitchentimer 2012-01-28
 com.liato.bankdroid_102.apk com.liato.bankdroid 2011-03-03
 com.liato.bankdroid_110.apk com.liato.bankdroid 2011-04-19
@@ -758,6 +897,13 @@ com.liato.bankdroid_154.apk com.liato.bankdroid 2013-04-08
 com.liato.bankdroid_155.apk com.liato.bankdroid 2013-06-03
 com.liato.bankdroid_160.apk com.liato.bankdroid 2013-06-25
 com.liato.bankdroid_161.apk com.liato.bankdroid 2013-10-01
+com.liato.bankdroid_166.apk com.liato.bankdroid 2013-11-05
+com.liato.bankdroid_173.apk com.liato.bankdroid 2013-12-13
+com.liato.bankdroid_174.apk com.liato.bankdroid 2013-12-24
+com.lightbox.android.camera_2.apk com.lightbox.android.camera 2013-12-09
+com.linkomnia.android.Changjie_3.apk com.linkomnia.android.Changjie 2013-12-15
+com.linkomnia.android.Changjie_7.apk com.linkomnia.android.Changjie 2014-01-15
+com.littlebytesofpi.pylauncher_4.apk com.littlebytesofpi.pylauncher 2013-12-15
 com.lukekorth.screennotifications_11.apk com.lukekorth.screennotifications 2013-04-08
 com.lukekorth.screennotifications_14.apk com.lukekorth.screennotifications 2013-07-08
 com.lukekorth.screennotifications_9.apk com.lukekorth.screennotifications 2013-01-18
@@ -769,6 +915,8 @@ com.manor.currentwidget_36.apk com.manor.currentwidget 2013-06-15
 com.manor.currentwidget_38.apk com.manor.currentwidget 2013-07-16
 com.manuelmaly.hn_10.apk com.manuelmaly.hn 2013-04-04
 com.manuelmaly.hn_11.apk com.manuelmaly.hn 2013-04-08
+com.manuelmaly.hn_15.apk com.manuelmaly.hn 2013-12-09
+com.manuelmaly.hn_16.apk com.manuelmaly.hn 2013-12-11
 com.mareksebera.dilbert_10.apk com.mareksebera.dilbert 2013-05-16
 com.mareksebera.dilbert_11.apk com.mareksebera.dilbert 2013-05-28
 com.mareksebera.dilbert_8.apk com.mareksebera.dilbert 2013-04-24
@@ -776,13 +924,20 @@ com.mareksebera.simpledilbert_15.apk com.mareksebera.simpledilbert 2013-07-05
 com.mareksebera.simpledilbert_29.apk com.mareksebera.simpledilbert 2013-08-09
 com.mareksebera.simpledilbert_30.apk com.mareksebera.simpledilbert 2013-08-19
 com.mareksebera.simpledilbert_31.apk com.mareksebera.simpledilbert 2013-08-22
+com.mareksebera.simpledilbert_32.apk com.mareksebera.simpledilbert 2013-11-18
 com.martinborjesson.o2xtouchlednotifications_71.apk com.martinborjesson.o2xtouchlednotifications 2013-01-10
 com.martinborjesson.o2xtouchlednotifications_78.apk com.martinborjesson.o2xtouchlednotifications 2013-05-20
 com.martinborjesson.o2xtouchlednotifications_81.apk com.martinborjesson.o2xtouchlednotifications 2013-05-28
 com.matburt.mobileorg_90.apk com.matburt.mobileorg 2012-10-26
 com.matburt.mobileorg_913.apk com.matburt.mobileorg 2013-08-15
 com.matburt.mobileorg_98.apk com.matburt.mobileorg 2013-02-22
+com.matoski.adbm_16.apk com.matoski.adbm 2013-12-11
+com.matoski.adbm_18.apk com.matoski.adbm 2013-12-13
+com.matteopacini.katana_21.apk com.matteopacini.katana 2014-01-07
 com.maxfierke.sandwichroulette_2.apk com.maxfierke.sandwichroulette 2012-08-29
+com.mehmetakiftutuncu.eshotroid_3.apk com.mehmetakiftutuncu.eshotroid 2013-12-11
+com.mehmetakiftutuncu.eshotroid_4.apk com.mehmetakiftutuncu.eshotroid 2014-01-08
+com.mehmetakiftutuncu.eshotroid_6.apk com.mehmetakiftutuncu.eshotroid 2014-01-15
 com.mendhak.gpslogger_27.apk com.mendhak.gpslogger 2013-03-05
 com.menny.android.anysoftkeyboard_102.apk com.menny.android.anysoftkeyboard 2013-06-04
 com.menny.android.anysoftkeyboard_106.apk com.menny.android.anysoftkeyboard 2013-08-15
@@ -798,11 +953,16 @@ com.miracleas.bitcoin_spinner_33.apk com.miracleas.bitcoin_spinner 2012-09-11
 com.miracleas.bitcoin_spinner_34.apk com.miracleas.bitcoin_spinner 2012-09-28
 com.miracleas.bitcoin_spinner_37.apk com.miracleas.bitcoin_spinner 2013-05-01
 com.miracleas.bitcoin_spinner_38.apk com.miracleas.bitcoin_spinner 2013-08-13
+com.miracleas.bitcoin_spinner_39.apk com.miracleas.bitcoin_spinner 2013-12-17
+com.mirasmithy.epochlauncher_2.apk com.mirasmithy.epochlauncher 2013-12-11
 com.mkf.droidsat_18.apk com.mkf.droidsat 2012-08-23
 com.mkf.droidsat_21.apk com.mkf.droidsat 2012-11-30
 com.mkf.droidsat_22.apk com.mkf.droidsat 2013-03-23
 com.mkf.droidsat_24.apk com.mkf.droidsat 2013-05-29
 com.mobilepearls.sokoban_12.apk com.mobilepearls.sokoban 2011-01-05
+com.mobiperf_101.apk com.mobiperf 2013-12-09
+com.mod.android.widget.fbcw_2.apk com.mod.android.widget.fbcw 2014-01-07
+com.mod.android.widget.fbcw_3.apk com.mod.android.widget.fbcw 2014-01-15
 com.mohammadag.beamfile_1.apk com.mohammadag.beamfile 2013-04-10
 com.mohammadag.beamfile_2.apk com.mohammadag.beamfile 2013-04-25
 com.mohammadag.beamfile_3.apk com.mohammadag.beamfile 2013-09-12
@@ -835,6 +995,7 @@ com.morphoss.acal_63.apk com.morphoss.acal 2013-09-28
 com.mp3tunes.android.player_89.apk com.mp3tunes.android.player 2011-04-09
 com.mridang.cellinfo_4.apk com.mridang.cellinfo 2013-06-22
 com.mridang.wifiinfo_3.apk com.mridang.wifiinfo 2013-04-14
+com.mykola.lexinproject_6.apk com.mykola.lexinproject 2014-01-07
 com.myopicmobile.textwarrior.android_11.apk com.myopicmobile.textwarrior.android 2013-04-17
 com.myopicmobile.textwarrior.android_13.apk com.myopicmobile.textwarrior.android 2013-04-17
 com.myopicmobile.textwarrior.android_9.apk com.myopicmobile.textwarrior.android 2012-09-07
@@ -846,12 +1007,16 @@ com.namelessdev.mpdroid_26.apk com.namelessdev.mpdroid 2012-10-17
 com.namelessdev.mpdroid_30.apk com.namelessdev.mpdroid 2013-04-07
 com.namelessdev.mpdroid_31.apk com.namelessdev.mpdroid 2013-04-29
 com.namelessdev.mpdroid_33.apk com.namelessdev.mpdroid 2013-07-02
+com.namelessdev.mpdroid_38.apk com.namelessdev.mpdroid 2013-12-13
+com.namelessdev.mpdroid_40.apk com.namelessdev.mpdroid 2013-12-24
 com.nanoconverter.zlab_35.apk com.nanoconverter.zlab 2012-08-29
 com.nanoconverter.zlab_37.apk com.nanoconverter.zlab 2013-01-30
 com.nanoconverter.zlab_38.apk com.nanoconverter.zlab 2013-02-08
 com.nauj27.android.colorpicker_20120308.apk com.nauj27.android.colorpicker 2012-08-26
 com.nauj27.android.colorpicker_20121130.apk com.nauj27.android.colorpicker 2013-02-08
+com.nauj27.android.colorpicker_20130326.apk com.nauj27.android.colorpicker 2013-11-17
 com.nephoapp.anarxiv_1.apk com.nephoapp.anarxiv 2012-08-29
+com.nesswit.galbijjimsearcher_7.apk com.nesswit.galbijjimsearcher 2013-12-15
 com.netthreads.android.noiz2_12.apk com.netthreads.android.noiz2 2012-09-07
 com.newsblur_24.apk com.newsblur 2012-10-30
 com.newsblur_29.apk com.newsblur 2013-02-11
@@ -860,13 +1025,17 @@ com.newsblur_32.apk com.newsblur 2013-04-22
 com.newsblur_35.apk com.newsblur 2013-06-06
 com.newsblur_38.apk com.newsblur 2013-06-28
 com.newsblur_43.apk com.newsblur 2013-08-15
+com.newsblur_44.apk com.newsblur 2013-11-17
 com.nexes.manager_212.apk com.nexes.manager 2011-03-09
 com.nexes.manager_218.apk com.nexes.manager 2011-07-22
 com.nexes.manager_4.apk com.nexes.manager 2011-01-23
 com.nightshadelabs.anotherbrowser_2.apk com.nightshadelabs.anotherbrowser 2012-08-23
 com.nilhcem.frcndict_10.apk com.nilhcem.frcndict 2013-03-26
+com.nilhcem.frcndict_11.apk com.nilhcem.frcndict 2014-01-02
 com.nilhcem.frcndict_8.apk com.nilhcem.frcndict 2012-09-22
 com.nilhcem.hostseditor_2.apk com.nilhcem.hostseditor 2013-05-28
+com.nilhcem.hostseditor_3.apk com.nilhcem.hostseditor 2013-12-31
+com.niparasc.papanikolis_1.apk com.niparasc.papanikolis 2014-01-07
 com.nolanlawson.apptracker_10.apk com.nolanlawson.apptracker 2012-08-29
 com.nolanlawson.chordreader_8.apk com.nolanlawson.chordreader 2012-09-07
 com.nolanlawson.jnameconverter_1.apk com.nolanlawson.jnameconverter 2013-01-10
@@ -874,6 +1043,9 @@ com.nolanlawson.keepscore_15.apk com.nolanlawson.keepscore 2012-08-29
 com.nolanlawson.keepscore_17.apk com.nolanlawson.keepscore 2012-10-11
 com.nolanlawson.keepscore_20.apk com.nolanlawson.keepscore 2013-03-26
 com.nolanlawson.keepscore_21.apk com.nolanlawson.keepscore 2013-09-06
+com.nolanlawson.keepscore_23.apk com.nolanlawson.keepscore 2013-11-20
+com.nolanlawson.keepscore_25.apk com.nolanlawson.keepscore 2013-12-07
+com.nolanlawson.keepscore_26.apk com.nolanlawson.keepscore 2014-01-07
 com.nolanlawson.logcat_37.apk com.nolanlawson.logcat 2012-09-15
 com.nolanlawson.logcat_40.apk com.nolanlawson.logcat 2013-03-30
 com.nolanlawson.logcat_41.apk com.nolanlawson.logcat 2013-04-25
@@ -896,6 +1068,8 @@ com.notriddle.budget_16.apk com.notriddle.budget 2013-08-05
 com.notriddle.budget_17.apk com.notriddle.budget 2013-08-05
 com.notriddle.budget_30.apk com.notriddle.budget 2013-08-28
 com.notriddle.budget_32.apk com.notriddle.budget 2013-10-16
+com.notriddle.budget_34.apk com.notriddle.budget 2013-11-17
+com.notriddle.budget_40.apk com.notriddle.budget 2013-12-29
 com.notriddle.null_launcer_11.apk com.notriddle.null_launcer 2013-07-14
 com.omegavesko.holocounter_1.apk com.omegavesko.holocounter 2013-01-18
 com.opendoorstudios.ds4droid_13.apk com.opendoorstudios.ds4droid 2013-03-30
@@ -908,6 +1082,10 @@ com.opendoorstudios.ds4droid_28.apk com.opendoorstudios.ds4droid 2013-04-28
 com.opendoorstudios.ds4droid_29.apk com.opendoorstudios.ds4droid 2013-04-30
 com.opendoorstudios.ds4droid_30.apk com.opendoorstudios.ds4droid 2013-05-04
 com.opendoorstudios.ds4droid_40.apk com.opendoorstudios.ds4droid 2013-07-22
+com.opendoorstudios.ds4droid_423.apk com.opendoorstudios.ds4droid 2013-11-13
+com.opendoorstudios.ds4droid_441.apk com.opendoorstudios.ds4droid 2013-11-16
+com.opendoorstudios.ds4droid_443.apk com.opendoorstudios.ds4droid 2013-11-16
+com.orphan.amplayer_1.apk com.orphan.amplayer 2013-12-09
 com.owncloud.android_103001.apk com.owncloud.android 2012-08-02
 com.owncloud.android_103007.apk com.owncloud.android 2012-08-24
 com.owncloud.android_103008.apk com.owncloud.android 2012-08-26
@@ -924,15 +1102,21 @@ com.owncloud.android_104003.apk com.owncloud.android 2013-07-22
 com.owncloud.android_104004.apk com.owncloud.android 2013-08-03
 com.owncloud.android_104005.apk com.owncloud.android 2013-09-23
 com.owncloud.android_104006.apk com.owncloud.android 2013-10-20
+com.owncloud.android_105000.apk com.owncloud.android 2013-11-16
+com.owncloud.android_105001.apk com.owncloud.android 2013-12-04
+com.owncloud.android_105002.apk com.owncloud.android 2013-12-13
 com.owncloud_1.apk com.owncloud 2012-05-18
 com.owncloud_103001.apk com.owncloud.android 2012-08-02
 com.owncloud_103003.apk com.owncloud.android 2012-08-09
 com.palliser.nztides_4.apk com.palliser.nztides 2012-10-01
 com.palliser.nztides_5.apk com.palliser.nztides 2012-08-23
+com.palliser.nztides_6.apk com.palliser.nztides 2013-11-17
 com.paranoid.ParanoidWallpapers_1.apk com.paranoid.ParanoidWallpapers 2013-06-13
 com.passwordmaker_10.apk com.passwordmaker 2012-08-13
 com.pilot51.voicenotify_13.apk com.pilot51.voicenotify 2013-01-15
 com.pilot51.voicenotify_15.apk com.pilot51.voicenotify 2013-06-19
+com.pilot51.voicenotify_16.apk com.pilot51.voicenotify 2014-01-04
+com.pilot51.voicenotify_17.apk com.pilot51.voicenotify 2014-01-15
 com.pindroid_44.apk com.pindroid 2012-08-29
 com.pindroid_45.apk com.pindroid 2012-09-25
 com.pindroid_46.apk com.pindroid 2012-10-16
@@ -945,9 +1129,12 @@ com.pindroid_53.apk com.pindroid 2013-04-20
 com.pindroid_54.apk com.pindroid 2013-04-26
 com.pindroid_55.apk com.pindroid 2013-05-14
 com.pindroid_56.apk com.pindroid 2013-07-04
+com.piratebayfree_8.apk com.piratebayfree 2014-01-07
 com.piwi.stickeroid_4.apk com.piwi.stickeroid 2012-08-23
 com.piwi.stickeroid_6.apk com.piwi.stickeroid 2012-08-23
 com.plusonelabs.calendar_14.apk com.plusonelabs.calendar 2013-06-24
+com.plusonelabs.calendar_16.apk com.plusonelabs.calendar 2013-11-18
+com.plusonelabs.calendar_19.apk com.plusonelabs.calendar 2014-01-14
 com.polipoid_2.apk com.polipoid 2013-10-01
 com.politedroid_3.apk com.politedroid 2012-08-29
 com.politedroid_4.apk com.politedroid 2012-08-29
@@ -968,11 +1155,14 @@ com.qubling.sidekick_11.apk com.qubling.sidekick 2012-08-23
 com.qubling.sidekick_15.apk com.qubling.sidekick 2013-01-30
 com.qubling.sidekick_16.apk com.qubling.sidekick 2013-04-09
 com.radioreddit.android_6.apk com.radioreddit.android 2013-06-26
+com.reicast.emulator_6.apk com.reicast.emulator 2013-12-29
 com.replica.replicaisland_14.apk com.replica.replicaisland 2011-03-03
 com.rhiannonweb.android.migrainetracker_2.apk com.rhiannonweb.android.migrainetracker 2012-08-29
 com.rigid.birthdroid_1.apk com.rigid.birthdroid 2013-03-18
 com.rigid.birthdroid_2.apk com.rigid.birthdroid 2013-05-12
 com.rigid.birthdroid_61.apk com.rigid.birthdroid 2013-09-21
+com.rigid.birthdroid_62.apk com.rigid.birthdroid 2013-12-12
+com.rigid.birthdroid_63.apk com.rigid.birthdroid 2013-12-15
 com.ringdroid_20500.apk com.ringdroid 2011-03-26
 com.ringdroid_20600.apk com.ringdroid 2012-10-11
 com.rj.pixelesque_7.apk com.rj.pixelesque 2012-09-18
@@ -984,6 +1174,7 @@ com.roguetemple.hydroid_1500.apk com.roguetemple.hydroid 2013-07-09
 com.roguetemple.hyperroid_370.apk com.roguetemple.hyperroid 2013-07-08
 com.roozen.SoundManager_18.apk com.roozen.SoundManager 2011-03-03
 com.roozen.SoundManagerv2_19.apk com.roozen.SoundManagerv2 2012-09-07
+com.ruesga.android.wallpapers.photophase_1008.apk com.ruesga.android.wallpapers.photophase 2013-12-09
 com.saibotd.bitbeaker_11.apk com.saibotd.bitbeaker 2012-08-23
 com.saibotd.bitbeaker_12.apk com.saibotd.bitbeaker 2012-09-30
 com.saibotd.bitbeaker_14.apk com.saibotd.bitbeaker 2012-11-05
@@ -993,8 +1184,11 @@ com.sam.hex_13.apk com.sam.hex 2012-08-23
 com.sam.hex_14.apk com.sam.hex 2012-08-24
 com.sam.hex_16.apk com.sam.hex 2013-06-03
 com.sandeel.bushidoblocks_13.apk com.sandeel.bushidoblocks 2013-05-08
+com.sapos_aplastados.game.clash_of_balls_111.apk com.sapos_aplastados.game.clash_of_balls 2014-01-07
+com.scar45.aokp.co.webviewer_2.apk com.scar45.aokp.co.webviewer 2013-12-15
 com.scottmain.android.searchlight_1.apk com.scottmain.android.searchlight 2012-01-27
 com.scottmain.android.searchlight_4.apk com.scottmain.android.searchlight 2012-07-26
+com.seafile.seadroid2_12.apk com.seafile.seadroid2 2013-12-11
 com.seafile.seadroid_2.apk com.seafile.seadroid 2013-03-23
 com.seavenois.tetris_1.apk com.seavenois.tetris 2012-03-10
 com.seavenois.tetris_3.apk com.seavenois.tetris 2012-08-23
@@ -1003,9 +1197,15 @@ com.seawolfsanctuary.keepingtracks_20130223.apk com.seawolfsanctuary.keepingtrac
 com.seawolfsanctuary.keepingtracks_20130323.apk com.seawolfsanctuary.keepingtracks 2013-03-23
 com.seawolfsanctuary.keepingtracks_20130421.apk com.seawolfsanctuary.keepingtracks 2013-04-22
 com.seawolfsanctuary.keepingtracks_20130727.apk com.seawolfsanctuary.keepingtracks 2013-08-06
+com.seawolfsanctuary.keepingtracks_20131113.apk com.seawolfsanctuary.keepingtracks 2013-11-15
 com.seb.SLWP_60.apk com.seb.SLWP 2013-05-10
 com.seb.SLWPmaps_2.apk com.seb.SLWPmaps 2013-05-25
 com.serone.desktoplabel_7.apk com.serone.desktoplabel 2012-07-26
+com.sgr_b2.compass_14.apk com.sgr_b2.compass 2013-11-13
+com.sgr_b2.compass_15.apk com.sgr_b2.compass 2013-11-28
+com.sgr_b2.compass_16.apk com.sgr_b2.compass 2013-12-24
+com.sgr_b2.compass_17.apk com.sgr_b2.compass 2014-01-15
+com.shahul3d.indiasatelliteweather_1.apk com.shahul3d.indiasatelliteweather 2013-12-11
 com.showmehills_16.apk com.showmehills 2012-08-08
 com.showmehills_2.apk com.showmehills 2012-05-29
 com.showmehills_21.apk com.showmehills 2012-09-14
@@ -1017,16 +1217,22 @@ com.shurik.droidzebra_12.apk com.shurik.droidzebra 2012-08-29
 com.sigseg.android.worldmap_5.apk com.sigseg.android.worldmap 2013-03-30
 com.silentlexx.instead_16109.apk com.silentlexx.instead 2013-10-23
 com.sinpo.xnfc_1.apk com.sinpo.xnfc 2012-08-23
+com.sismics.reader_5.apk com.sismics.reader 2013-12-15
+com.sismics.reader_6.apk com.sismics.reader 2013-12-18
+com.sli.ohmcalc_1.apk com.sli.ohmcalc 2014-01-09
 com.smerty.ham_18.apk com.smerty.ham 2012-10-05
 com.smorgasbork.hotdeath_3.apk com.smorgasbork.hotdeath 2011-12-06
 com.smorgasbork.hotdeath_6.apk com.smorgasbork.hotdeath 2012-01-24
 com.smorgasbork.hotdeath_7.apk com.smorgasbork.hotdeath 2012-02-05
 com.smorgasbork.hotdeath_8.apk com.smorgasbork.hotdeath 2012-04-24
+com.spazedog.mounts2sd_33.apk com.spazedog.mounts2sd 2013-12-09
 com.sputnik.wispr_147.apk com.sputnik.wispr 2012-08-29
 com.stericson.permissions_4.apk com.stericson.permissions 2012-01-27
+com.studio332.flickit_3.apk com.studio332.flickit 2014-01-09
 com.sweetiepiggy.everylocale_6.apk com.sweetiepiggy.everylocale 2012-09-10
 com.sweetiepiggy.everylocale_8.apk com.sweetiepiggy.everylocale 2013-03-27
 com.sweetiepiggy.everylocale_9.apk com.sweetiepiggy.everylocale 2013-07-11
+com.taiste.lainari_en_18.apk com.taiste.lainari_en 2013-12-11
 com.tastycactus.timesheet_5.apk com.tastycactus.timesheet 2012-02-05
 com.tastycactus.timesheet_6.apk com.tastycactus.timesheet 2013-06-19
 com.teamdc.stephendiniz.autoaway_15.apk com.teamdc.stephendiniz.autoaway 2013-04-07
@@ -1039,23 +1245,39 @@ com.teleca.jamendo_35.apk com.teleca.jamendo 2012-01-28
 com.teleca.jamendo_37.apk com.teleca.jamendo 2012-09-30
 com.teleca.jamendo_38.apk com.teleca.jamendo 2012-11-08
 com.templaro.opsiz.aka_10.apk com.templaro.opsiz.aka 2012-08-29
+com.ten15.diyfish_2.apk com.ten15.diyfish 2013-12-15
+com.textuality.lifesaver2_6.apk com.textuality.lifesaver2 2013-11-05
+com.th.XenonWallpapers_2.apk com.th.XenonWallpapers 2014-01-07
 com.threedlite.livePolys_1.apk com.threedlite.livePolys 2012-09-28
 com.threedlite.urforms_11.apk com.threedlite.urforms 2012-09-28
 com.threedlite.urforms_12.apk com.threedlite.urforms 2012-10-01
 com.threedlite.urforms_14.apk com.threedlite.urforms 2012-10-22
+com.threedlite.userhash.location_2.apk com.threedlite.userhash.location 2013-12-09
+com.tkjelectronics.balanduino_1000050.apk com.tkjelectronics.balanduino 2014-01-14
+com.tkjelectronics.balanduino_1200050.apk com.tkjelectronics.balanduino 2014-01-14
 com.tmarki.comicmaker_33.apk com.tmarki.comicmaker 2013-02-14
+com.tobykurien.google_news_11.apk com.tobykurien.google_news 2013-11-16
+com.tobykurien.google_news_8.apk com.tobykurien.google_news 2013-10-25
+com.tobykurien.google_news_9.apk com.tobykurien.google_news 2013-10-29
 com.tortuca.holoken_11.apk com.tortuca.holoken 2013-03-19
 com.totsp.bookworm_18.apk com.totsp.bookworm 2011-01-27
 com.totsp.bookworm_19.apk com.totsp.bookworm 2011-05-04
 com.totsp.crossword.shortyz_30100.apk com.totsp.crossword.shortyz 2012-01-08
 com.totsp.crossword.shortyz_30201.apk com.totsp.crossword.shortyz 2013-02-02
+com.totsp.crossword.shortyz_30210.apk com.totsp.crossword.shortyz 2013-11-18
+com.traffar.game_of_life_1.apk com.traffar.game_of_life 2013-12-24
+com.traffar.game_of_life_2.apk com.traffar.game_of_life 2014-01-11
 com.tum.yahtzee_1.apk com.tum.yahtzee 2012-08-23
 com.tunes.viewer_14.apk com.tunes.viewer 2013-03-21
 com.tunes.viewer_16.apk com.tunes.viewer 2013-03-22
+com.u17od.upm_15.apk com.u17od.upm 2013-12-09
 com.ubergeek42.WeechatAndroid_4.apk com.ubergeek42.WeechatAndroid 2013-03-05
 com.ubergeek42.WeechatAndroid_5.apk com.ubergeek42.WeechatAndroid 2013-04-09
 com.ubuntuone.android.files_460.apk com.ubuntuone.android.files 2013-05-10
+com.ultramegatech.ey_6.apk com.ultramegatech.ey 2013-12-15
 com.umang.dashnotifier_10.apk com.umang.dashnotifier 2013-10-23
+com.umang.dashnotifier_13.apk com.umang.dashnotifier 2013-11-18
+com.umang.dashnotifier_18.apk com.umang.dashnotifier 2013-11-28
 com.umang.dashnotifier_9.apk com.umang.dashnotifier 2013-10-08
 com.unitedcoders.android.gpodroid_12.apk com.unitedcoders.android.gpodroid 2012-01-08
 com.updater.ota_6.apk com.updater.ota 2012-08-29
@@ -1065,6 +1287,7 @@ com.uploadedlobster.PwdHash_13.apk com.uploadedlobster.PwdHash 2013-06-03
 com.uploadedlobster.PwdHash_15.apk com.uploadedlobster.PwdHash 2013-07-02
 com.uploadedlobster.PwdHash_18.apk com.uploadedlobster.PwdHash 2013-09-11
 com.uploadedlobster.PwdHash_19.apk com.uploadedlobster.PwdHash 2013-10-01
+com.uploadedlobster.PwdHash_20.apk com.uploadedlobster.PwdHash 2013-12-28
 com.uploadedlobster.PwdHash_9.apk com.uploadedlobster.PwdHash 2012-07-21
 com.uraroji.garage.android.mp3recvoice_1.apk com.uraroji.garage.android.mp3recvoice 2013-07-31
 com.valleytg.oasvn.android_10.apk com.valleytg.oasvn.android 2012-09-22
@@ -1075,8 +1298,13 @@ com.veken0m.bitcoinium_31.apk com.veken0m.bitcoinium 2013-05-11
 com.veken0m.bitcoinium_33.apk com.veken0m.bitcoinium 2013-05-29
 com.veken0m.bitcoinium_41.apk com.veken0m.bitcoinium 2013-09-30
 com.veken0m.bitcoinium_43.apk com.veken0m.bitcoinium 2013-10-23
+com.veken0m.bitcoinium_46.apk com.veken0m.bitcoinium 2013-11-13
+com.veken0m.bitcoinium_48.apk com.veken0m.bitcoinium 2013-12-02
 com.vlille.checker_2.apk com.vlille.checker 2012-09-18
 com.vlille.checker_5.apk com.vlille.checker 2013-03-04
+com.vlille.checker_600.apk com.vlille.checker 2013-12-09
+com.vlille.checker_601.apk com.vlille.checker 2013-12-17
+com.vmihalachi.turboeditor_7.apk com.vmihalachi.turboeditor 2013-12-11
 com.voidcode.diasporawebclient_10.apk com.voidcode.diasporawebclient 2012-04-08
 com.voidcode.diasporawebclient_3.apk com.voidcode.diasporawebclient 2011-12-08
 com.voidcode.diasporawebclient_6.apk com.voidcode.diasporawebclient 2012-01-28
@@ -1088,11 +1316,19 @@ com.volosyukivan_30.apk com.volosyukivan 2013-07-02
 com.vonglasow.michael.satstat_1.apk com.vonglasow.michael.satstat 2013-09-06
 com.vonglasow.michael.satstat_10.apk com.vonglasow.michael.satstat 2013-09-12
 com.vonglasow.michael.satstat_30.apk com.vonglasow.michael.satstat 2013-09-28
+com.vonglasow.michael.satstat_40.apk com.vonglasow.michael.satstat 2013-11-24
+com.vonglasow.michael.satstat_50.apk com.vonglasow.michael.satstat 2014-01-15
+com.vwp.owmap_101.apk com.vwp.owmap 2014-01-13
+com.vwp.owmap_102.apk com.vwp.owmap 2014-01-15
+com.vwp.owmap_95.apk com.vwp.owmap 2013-12-09
 com.wanghaus.remembeer_48.apk com.wanghaus.remembeer 2011-03-29
 com.wanghaus.remembeer_50.apk com.wanghaus.remembeer 2011-06-29
 com.webworxshop.swallowcatcher_5.apk com.webworxshop.swallowcatcher 2011-03-10
 com.webworxshop.swallowcatcher_6.apk com.webworxshop.swallowcatcher 2011-07-12
 com.webworxshop.swallowcatcher_7.apk com.webworxshop.swallowcatcher 2011-12-07
+com.weicheng.taipeiyoubikeoffline_1.apk com.weicheng.taipeiyoubikeoffline 2013-12-15
+com.wentam.defcol_6.apk com.wentam.defcol 2013-12-15
+com.willhauck.linconnectclient_7.apk com.willhauck.linconnectclient 2013-12-15
 com.write.Quill_36.apk com.write.Quill 2012-09-18
 com.write.Quill_37.apk com.write.Quill 2012-11-01
 com.write.Quill_40.apk com.write.Quill 2013-07-02
@@ -1102,11 +1338,16 @@ com.xabber.androiddev_80.apk com.xabber.androiddev 2013-09-05
 com.xabber.androiddev_81.apk com.xabber.androiddev 2013-09-23
 com.xatik.app.droiddraw.client_4.apk com.xatik.app.droiddraw.client 2012-09-08
 com.xlythe.minecraftclock_4.apk com.xlythe.minecraftclock 2013-06-26
+com.yubico.yubiclip_1.apk com.yubico.yubiclip 2013-11-08
 com.yubico.yubioath_10.apk com.yubico.yubioath 2013-09-03
 com.yubico.yubioath_14.apk com.yubico.yubioath 2013-09-06
+com.yubico.yubioath_15.apk com.yubico.yubioath 2013-11-08
+com.yubico.yubioath_17.apk com.yubico.yubioath 2013-11-22
+com.yubico.yubioath_18.apk com.yubico.yubioath 2013-11-23
 com.yubico.yubitotp_4.apk com.yubico.yubitotp 2013-03-07
 com.yubico.yubitotp_6.apk com.yubico.yubitotp 2013-06-04
 com.zachrattner.pockettalk_7.apk com.zachrattner.pockettalk 2012-09-07
+com.zagayevskiy.pacman_2.apk com.zagayevskiy.pacman 2013-10-29
 com.zapta.apps.maniana_18.apk com.zapta.apps.maniana 2012-03-23
 com.zapta.apps.maniana_20.apk com.zapta.apps.maniana 2012-04-06
 com.zapta.apps.maniana_24.apk com.zapta.apps.maniana 2012-08-29
@@ -1128,6 +1369,7 @@ cx.hell.android.pdfview_40000.apk cx.hell.android.pdfview 2013-04-09
 cxa.lineswallpaper_9.apk cxa.lineswallpaper 2013-01-10
 cz.hejl.chesswalk_7.apk cz.hejl.chesswalk 2012-01-12
 cz.hejl.chesswalk_8.apk cz.hejl.chesswalk 2012-08-29
+cz.hejl.chesswalk_9.apk cz.hejl.chesswalk 2013-11-23
 cz.romario.opensudoku_1104.apk cz.romario.opensudoku 2012-01-12
 cz.romario.opensudoku_1105.apk cz.romario.opensudoku 2012-01-12
 damo.three.ie_8.apk damo.three.ie 2013-08-16
@@ -1140,11 +1382,20 @@ de.antonwolf.agendawidget_22.apk de.antonwolf.agendawidget 2012-08-23
 de.arnowelzel.android.periodical_10.apk de.arnowelzel.android.periodical 2013-04-07
 de.arnowelzel.android.periodical_13.apk de.arnowelzel.android.periodical 2013-06-22
 de.arnowelzel.android.periodical_9.apk de.arnowelzel.android.periodical 2013-03-22
+de.azapps.mirakel.dashclock_4.apk de.azapps.mirakel.dashclock 2013-11-08
+de.azapps.mirakel.dashclock_5.apk de.azapps.mirakel.dashclock 2013-11-19
+de.azapps.mirakel.dashclock_7.apk de.azapps.mirakel.dashclock 2013-12-31
+de.azapps.mirakelandroid_10.apk de.azapps.mirakelandroid 2013-11-06
+de.azapps.mirakelandroid_16.apk de.azapps.mirakelandroid 2013-11-19
+de.azapps.mirakelandroid_17.apk de.azapps.mirakelandroid 2013-11-22
 de.azapps.mirakelandroid_2.apk de.azapps.mirakelandroid 2013-07-25
 de.azapps.mirakelandroid_3.apk de.azapps.mirakelandroid 2013-08-03
+de.azapps.mirakelandroid_31.apk de.azapps.mirakelandroid 2013-12-29
 de.azapps.mirakelandroid_4.apk de.azapps.mirakelandroid 2013-08-28
 de.azapps.mirakelandroid_5.apk de.azapps.mirakelandroid 2013-10-01
 de.azapps.mirakelandroid_6.apk de.azapps.mirakelandroid 2013-10-16
+de.azapps.mirakelandroid_7.apk de.azapps.mirakelandroid 2013-11-02
+de.azapps.mirakelandroid_8.apk de.azapps.mirakelandroid 2013-11-04
 de.blau.android.Application_14.apk de.blau.android
 de.blau.android_14.apk de.blau.android 2012-05-16
 de.blau.android_17.apk de.blau.android 2013-01-09
@@ -1153,10 +1404,15 @@ de.blau.android_19.apk de.blau.android 2013-03-28
 de.blinkt.openvpn_48.apk de.blinkt.openvpn 2012-09-07
 de.blinkt.openvpn_49.apk de.blinkt.openvpn 2012-09-16
 de.blinkt.openvpn_51.apk de.blinkt.openvpn 2012-10-11
+de.blinkt.openvpn_80.apk de.blinkt.openvpn 2013-11-05
+de.blinkt.openvpn_81.apk de.blinkt.openvpn 2013-12-02
+de.blinkt.openvpn_82.apk de.blinkt.openvpn 2013-12-09
 de.cketti.dashclock.k9_1.apk de.cketti.dashclock.k9 2013-06-30
+de.cketti.dashclock.k9_104000.apk de.cketti.dashclock.k9 2013-12-24
 de.cketti.dashclock.k9_2.apk de.cketti.dashclock.k9 2013-07-02
 de.cketti.dashclock.k9_3.apk de.cketti.dashclock.k9 2013-07-30
 de.cketti.dashclock.k9_4.apk de.cketti.dashclock.k9 2013-08-22
+de.cwde.freeshisen_7.apk de.cwde.freeshisen 2013-12-03
 de.danielweisser.android.ldapsync_12.apk de.danielweisser.android.ldapsync 2012-07-26
 de.danoeh.antennapod_14.apk de.danoeh.antennapod 2012-09-20
 de.danoeh.antennapod_16.apk de.danoeh.antennapod 2012-09-20
@@ -1179,6 +1435,7 @@ de.danoeh.antennapod_33.apk de.danoeh.antennapod 2013-10-20
 de.delusions.measure_17.apk de.delusions.measure 2013-01-29
 de.delusions.measure_9.apk de.delusions.measure 2012-03-23
 de.duenndns.gmdice_6.apk de.duenndns.gmdice 2012-04-20
+de.enaikoon.android.keypadmapper3_47.apk de.enaikoon.android.keypadmapper3 2013-11-12
 de.fmaul.android.cmis_8.apk de.fmaul.android.cmis 2012-03-10
 de.freewarepoint.whohasmystuff_10.apk de.freewarepoint.whohasmystuff 2013-04-07
 de.freewarepoint.whohasmystuff_11.apk de.freewarepoint.whohasmystuff 2013-04-16
@@ -1188,32 +1445,50 @@ de.geeksfactory.opacclient_54.apk de.geeksfactory.opacclient 2013-09-20
 de.grobox.blitzmail_1.apk de.grobox.blitzmail 2013-03-30
 de.grobox.blitzmail_2.apk de.grobox.blitzmail 2013-04-08
 de.grobox.blitzmail_3.apk de.grobox.blitzmail 2013-04-12
+de.grobox.blitzmail_4.apk de.grobox.blitzmail 2013-12-02
+de.grobox.blitzmail_5.apk de.grobox.blitzmail 2013-12-08
 de.grobox.liberario_1.apk de.grobox.liberario 2013-10-02
 de.grobox.liberario_2.apk de.grobox.liberario 2013-10-03
+de.grobox.liberario_3.apk de.grobox.liberario 2013-11-03
+de.grobox.liberario_4.apk de.grobox.liberario 2013-11-10
+de.grobox.liberario_5.apk de.grobox.liberario 2013-11-16
+de.grobox.liberario_6.apk de.grobox.liberario 2013-11-28
+de.hechler.andfish_20.apk de.hechler.andfish 2013-12-09
+de.homac.Mirrored_11.apk de.homac.Mirrored 2013-11-08
 de.homac.Mirrored_6.apk de.homac.Mirrored 2012-09-07
 de.homac.Mirrored_9.apk de.homac.Mirrored 2012-09-07
 de.jdsoft.law_11.apk de.jdsoft.law 2013-08-27
 de.jdsoft.law_12.apk de.jdsoft.law 2013-10-04
 de.jdsoft.law_8.apk de.jdsoft.law 2013-08-16
 de.jdsoft.law_9.apk de.jdsoft.law 2013-08-19
+de.jurihock.voicesmith_10.apk de.jurihock.voicesmith 2013-10-28
+de.jurihock.voicesmith_11.apk de.jurihock.voicesmith 2014-01-02
 de.jurihock.voicesmith_7.apk de.jurihock.voicesmith 2012-09-07
 de.jurihock.voicesmith_8.apk de.jurihock.voicesmith 2012-09-18
 de.jurihock.voicesmith_9.apk de.jurihock.voicesmith 2012-09-28
+de.koelle.christian.trickytripper_12.apk de.koelle.christian.trickytripper 2014-01-07
 de.kromonos.android.rpcoiner_1.apk de.kromonos.android.rpcoiner 2012-08-29
 de.kugihan.dictionaryformids.hmi_android_98.apk de.kugihan.dictionaryformids.hmi_android 2013-01-02
+de.laxu.apps.nachtlagerdownloader_1.apk de.laxu.apps.nachtlagerdownloader 2013-12-09
 de.luhmer.owncloudnewsreader_20.apk de.luhmer.owncloudnewsreader 2013-06-29
 de.luhmer.owncloudnewsreader_21.apk de.luhmer.owncloudnewsreader 2013-07-22
 de.luhmer.owncloudnewsreader_22.apk de.luhmer.owncloudnewsreader 2013-07-30
 de.luhmer.owncloudnewsreader_26.apk de.luhmer.owncloudnewsreader 2013-08-13
 de.luhmer.owncloudnewsreader_30.apk de.luhmer.owncloudnewsreader 2013-09-07
+de.luhmer.owncloudnewsreader_37.apk de.luhmer.owncloudnewsreader 2013-11-08
+de.luhmer.owncloudnewsreader_39.apk de.luhmer.owncloudnewsreader 2013-12-02
 de.mangelow.network_3.apk de.mangelow.network 2012-09-07
+de.markusfisch.android.wavelines_3.apk de.markusfisch.android.wavelines 2013-12-15
 de.mbutscher.wikiandpad.alphabeta_200200.apk de.mbutscher.wikiandpad.alphabeta 2012-08-23
 de.mbutscher.wikiandpad.alphabeta_200300.apk de.mbutscher.wikiandpad.alphabeta 2013-02-28
+de.onyxbits.drudgery_2.apk de.onyxbits.drudgery 2013-12-09
+de.onyxbits.drudgery_4.apk de.onyxbits.drudgery 2013-12-13
 de.onyxbits.listmyapps_3.apk de.onyxbits.listmyapps 2013-09-04
 de.onyxbits.listmyapps_4.apk de.onyxbits.listmyapps 2013-09-23
 de.onyxbits.listmyapps_5.apk de.onyxbits.listmyapps 2013-10-02
 de.onyxbits.listmyapps_6.apk de.onyxbits.listmyapps 2013-10-02
 de.onyxbits.listmyapps_7.apk de.onyxbits.listmyapps 2013-10-08
+de.onyxbits.listmyapps_8.apk de.onyxbits.listmyapps 2013-11-05
 de.onyxbits.pocketbandit_2.apk de.onyxbits.pocketbandit 2013-03-09
 de.onyxbits.remotekeyboard_2.apk de.onyxbits.remotekeyboard 2013-06-15
 de.onyxbits.remotekeyboard_3.apk de.onyxbits.remotekeyboard 2013-07-02
@@ -1221,6 +1496,10 @@ de.onyxbits.remotekeyboard_4.apk de.onyxbits.remotekeyboard 2013-07-16
 de.onyxbits.remotekeyboard_5.apk de.onyxbits.remotekeyboard 2013-09-04
 de.onyxbits.remotekeyboard_6.apk de.onyxbits.remotekeyboard 2013-10-12
 de.onyxbits.sensorreadout_3.apk de.onyxbits.sensorreadout 2012-09-07
+de.onyxbits.sensorreadout_5.apk de.onyxbits.sensorreadout 2013-11-16
+de.onyxbits.textfiction_3.apk de.onyxbits.textfiction 2014-01-09
+de.qspool.clementineremote_21.apk de.qspool.clementineremote 2013-11-27
+de.qspool.clementineremote_25.apk de.qspool.clementineremote 2013-12-11
 de.schaeuffelhut.android.openvpn_39.apk de.schaeuffelhut.android.openvpn 2013-01-10
 de.schildbach.wallet_121.apk de.schildbach.wallet 2013-04-14
 de.schildbach.wallet_124.apk de.schildbach.wallet 2013-05-09
@@ -1228,6 +1507,9 @@ de.schildbach.wallet_134.apk de.schildbach.wallet 2013-08-03
 de.schildbach.wallet_136.apk de.schildbach.wallet 2013-08-12
 de.schildbach.wallet_140.apk de.schildbach.wallet 2013-08-28
 de.schildbach.wallet_143.apk de.schildbach.wallet 2013-10-24
+de.schildbach.wallet_144.apk de.schildbach.wallet 2013-11-22
+de.schildbach.wallet_148.apk de.schildbach.wallet 2013-11-30
+de.schildbach.wallet_149.apk de.schildbach.wallet 2013-12-18
 de.schildbach.wallet_66.apk de.schildbach.wallet 2012-02-27
 de.schildbach.wallet_74.apk de.schildbach.wallet 2012-04-08
 de.schildbach.wallet_87.apk de.schildbach.wallet 2012-06-30
@@ -1236,6 +1518,9 @@ de.schildbach.wallet_test_124.apk de.schildbach.wallet_test 2013-05-11
 de.schildbach.wallet_test_134.apk de.schildbach.wallet_test 2013-08-03
 de.schildbach.wallet_test_135.apk de.schildbach.wallet_test 2013-08-12
 de.schildbach.wallet_test_139.apk de.schildbach.wallet_test 2013-08-25
+de.schildbach.wallet_test_144.apk de.schildbach.wallet_test 2013-11-22
+de.schildbach.wallet_test_148.apk de.schildbach.wallet_test 2013-11-30
+de.schildbach.wallet_test_149.apk de.schildbach.wallet_test 2013-12-18
 de.schildbach.wallet_test_74.apk de.schildbach.wallet_test 2012-04-07
 de.schildbach.wallet_test_75.apk de.schildbach.wallet_test 2012-04-07
 de.schildbach.wallet_test_87.apk de.schildbach.wallet_test 2012-06-28
@@ -1265,17 +1550,25 @@ de.shandschuh.sparserss_87.apk de.shandschuh.sparserss 2012-10-22
 de.skubware.opentraining_11.apk de.skubware.opentraining 2013-06-04
 de.skubware.opentraining_18.apk de.skubware.opentraining 2013-10-22
 de.skubware.opentraining_19.apk de.skubware.opentraining 2013-10-23
+de.skubware.opentraining_22.apk de.skubware.opentraining 2013-12-17
 de.skubware.opentraining_5.apk de.skubware.opentraining 2012-10-05
 de.skubware.opentraining_6.apk de.skubware.opentraining 2012-10-08
 de.skubware.opentraining_8.apk de.skubware.opentraining 2013-04-26
+de.srlabs.gsmmap_10.apk de.srlabs.gsmmap 2014-01-15
+de.srlabs.gsmmap_2.apk de.srlabs.gsmmap 2013-12-31
 de.stefan_oltmann.falling_blocks_8.apk de.stefan_oltmann.falling_blocks 2012-09-26
 de.stefan_oltmann.kaesekaestchen_7.apk de.stefan_oltmann.kaesekaestchen 2012-09-26
+de.syss.MifareClassicTool_18.apk de.syss.MifareClassicTool 2013-12-09
+de.syss.MifareClassicTool_19.apk de.syss.MifareClassicTool 2013-12-27
+de.syss.MifareClassicTool_20.apk de.syss.MifareClassicTool 2014-01-15
 de.tui.itlogger_2.apk de.tui.itlogger 2012-09-11
 de.tum.in.tumcampus_20.apk de.tum.in.tumcampus 2013-07-22
+de.tum.in.tumcampus_32.apk de.tum.in.tumcampus 2013-11-23
 de.ub0r.android.adBlock_5.apk de.ub0r.android.adBlock 2011-01-23
 de.ub0r.android.callmeter_7362000.apk de.ub0r.android.callmeter 2012-10-24
 de.ub0r.android.callmeter_7381000.apk de.ub0r.android.callmeter 2013-02-22
 de.ub0r.android.callmeter_7384000.apk de.ub0r.android.callmeter 2013-03-26
+de.ub0r.android.callmeter_7391002.apk de.ub0r.android.callmeter 2013-11-18
 de.ub0r.android.clipboardbeam_14100000.apk de.ub0r.android.clipboardbeam 2013-06-22
 de.ub0r.android.otpdroid_157.apk de.ub0r.android.otpdroid 2013-03-04
 de.ub0r.android.smsdroid_7140002.apk de.ub0r.android.smsdroid 2012-10-24
@@ -1291,9 +1584,12 @@ de.ub0r.android.websms_7471000.apk de.ub0r.android.websms 2013-10-20
 de.uni_potsdam.hpi.openmensa_4.apk de.uni_potsdam.hpi.openmensa 2013-03-15
 de.uni_potsdam.hpi.openmensa_6.apk de.uni_potsdam.hpi.openmensa 2013-06-06
 de.uni_potsdam.hpi.openmensa_7.apk de.uni_potsdam.hpi.openmensa 2013-09-20
+de.uni_potsdam.hpi.openmensa_8.apk de.uni_potsdam.hpi.openmensa 2013-12-02
 de.wikilab.android.friendica01_8.apk de.wikilab.android.friendica01 2013-01-18
 de.wikilab.android.friendica01_9.apk de.wikilab.android.friendica01 2013-06-02
 de.yaacc_1.apk de.yaacc 2013-08-16
+de.yaacc_4.apk de.yaacc 2013-12-02
+de.yaacc_7.apk de.yaacc 2013-12-22
 dentex.youtube.downloader_30.apk dentex.youtube.downloader 2013-01-21
 dentex.youtube.downloader_31.apk dentex.youtube.downloader 2013-01-30
 dentex.youtube.downloader_32.apk dentex.youtube.downloader 2013-01-30
@@ -1324,6 +1620,8 @@ dev.ukanth.ufirewall_125.apk dev.ukanth.ufirewall 2013-04-25
 dev.ukanth.ufirewall_129.apk dev.ukanth.ufirewall 2013-06-02
 dev.ukanth.ufirewall_132.apk dev.ukanth.ufirewall 2013-08-12
 dev.ukanth.ufirewall_136.apk dev.ukanth.ufirewall 2013-09-09
+dev.ukanth.ufirewall_141.apk dev.ukanth.ufirewall 2014-01-07
+dev.ukanth.ufirewall_146.apk dev.ukanth.ufirewall 2014-01-17
 dk.andsen.asqlitemanager_10.apk dk.andsen.asqlitemanager 2012-01-26
 dk.andsen.asqlitemanager_11.apk dk.andsen.asqlitemanager 2012-04-18
 dk.andsen.asqlitemanager_12.apk dk.andsen.asqlitemanager 2012-06-14
@@ -1335,6 +1633,9 @@ dk.andsen.asqlitemanager_17.apk dk.andsen.asqlitemanager 2013-05-14
 dk.andsen.asqlitemanager_7.apk dk.andsen.asqlitemanager 2011-12-05
 dk.andsen.asqlitemanager_9.apk dk.andsen.asqlitemanager 2011-12-08
 dk.jens.backup_10.apk dk.jens.backup 2013-10-01
+dk.jens.backup_11.apk dk.jens.backup 2013-11-06
+dk.jens.backup_12.apk dk.jens.backup 2013-12-12
+dk.jens.backup_13.apk dk.jens.backup 2014-01-14
 dk.jens.backup_3.apk dk.jens.backup 2013-07-22
 dk.jens.backup_4.apk dk.jens.backup 2013-07-24
 dk.jens.backup_5.apk dk.jens.backup 2013-08-07
@@ -1345,6 +1646,7 @@ dk.mide.fas.cmnightlies_2.apk dk.mide.fas.cmnightlies 2013-04-23
 dk.nindroid.rss_119.apk dk.nindroid.rss 2013-06-24
 edu.killerud.kitchentimer_3.apk edu.killerud.kitchentimer 2012-04-03
 edu.killerud.kitchentimer_4.apk edu.killerud.kitchentimer 2012-09-23
+edu.killerud.kitchentimer_5.apk edu.killerud.kitchentimer 2013-10-29
 edu.nyu.cs.omnidroid.app_6.apk edu.nyu.cs.omnidroid.app 2011-10-04
 edu.rit.poe.atomix_2.apk edu.rit.poe.atomix 2011-03-02
 edu.sfsu.cs.orange.ocr_31.apk edu.sfsu.cs.orange.ocr 2013-04-10
@@ -1358,6 +1660,7 @@ eu.domob.anacam_10100.apk eu.domob.anacam 2012-07-30
 eu.domob.anacam_10200.apk eu.domob.anacam 2012-10-31
 eu.domob.angulo_10100.apk eu.domob.angulo 2012-07-11
 eu.domob.angulo_10200.apk eu.domob.angulo 2012-07-30
+eu.domob.angulo_10300.apk eu.domob.angulo 2013-12-24
 eu.domob.bjtrainer_100.apk eu.domob.bjtrainer 2012-08-22
 eu.e43.impeller_10.apk eu.e43.impeller 2013-06-27
 eu.e43.impeller_11.apk eu.e43.impeller 2013-06-28
@@ -1378,8 +1681,13 @@ eu.e43.impeller_6.apk eu.e43.impeller 2013-05-25
 eu.e43.impeller_6000.apk eu.e43.impeller 2013-07-30
 eu.e43.impeller_6001.apk eu.e43.impeller 2013-08-15
 eu.e43.impeller_6002.apk eu.e43.impeller 2013-08-22
+eu.e43.impeller_6003.apk eu.e43.impeller 2013-11-02
 eu.e43.impeller_7.apk eu.e43.impeller 2013-05-28
+eu.e43.impeller_7000.apk eu.e43.impeller 2013-11-03
 eu.e43.impeller_8.apk eu.e43.impeller 2013-06-03
+eu.e43.impeller_8002.apk eu.e43.impeller 2013-11-24
+eu.e43.impeller_8003.apk eu.e43.impeller 2013-12-08
+eu.e43.impeller_8005.apk eu.e43.impeller 2013-12-22
 eu.e43.impeller_9.apk eu.e43.impeller 2013-06-13
 eu.flatworld.android.slider_3.apk eu.flatworld.android.slider 2013-03-09
 eu.hydrologis.geopaparazzi_30.apk eu.hydrologis.geopaparazzi 2012-09-07
@@ -1389,6 +1697,7 @@ eu.hydrologis.geopaparazzi_34.apk eu.hydrologis.geopaparazzi 2012-09-26
 eu.hydrologis.geopaparazzi_37.apk eu.hydrologis.geopaparazzi 2012-10-11
 eu.hydrologis.geopaparazzi_38.apk eu.hydrologis.geopaparazzi 2012-10-16
 eu.hydrologis.geopaparazzi_39.apk eu.hydrologis.geopaparazzi 2012-11-30
+eu.johncasson.meerkatchallenge_1.apk eu.johncasson.meerkatchallenge 2013-12-11
 eu.lavarde.pmtd_2012121820.apk eu.lavarde.pmtd 2013-01-02
 eu.lavarde.pmtd_2013020313.apk eu.lavarde.pmtd 2013-02-12
 eu.lavarde.pmtd_2013050413.apk eu.lavarde.pmtd 2013-05-05
@@ -1424,6 +1733,9 @@ fennec-21.0.multi.android-arm.apk org.mozilla.firefox 2013-05-14
 fennec-22.0.multi.android-arm.apk org.mozilla.firefox 2013-06-27
 fennec-23.0.multi.android-arm.apk org.mozilla.firefox 2013-08-07
 fennec-24.0.multi.android-arm.apk org.mozilla.firefox 2013-10-01
+fennec-25.0.1.multi.android-arm.apk org.mozilla.firefox 2013-11-18
+fennec-25.0.multi.android-arm.apk org.mozilla.firefox 2013-10-29
+fennec-26.0.multi.android-arm.apk org.mozilla.firefox 2013-12-11
 fennec-5.0.multi.eabi-arm.apk org.mozilla.firefox
 fennec-6.0.multi.eabi-arm.apk org.mozilla.firefox
 fennec-9.0.multi.android-arm.apk org.mozilla.firefox 2012-01-19
@@ -1437,6 +1749,7 @@ fi.mikuz.boarder_14.apk fi.mikuz.boarder 2013-10-01
 fi.mikuz.boarder_7.apk fi.mikuz.boarder 2012-09-07
 fi.mikuz.boarder_8.apk fi.mikuz.boarder 2012-09-10
 fi.mikuz.boarder_9.apk fi.mikuz.boarder 2013-02-22
+fi.testbed2_20.apk fi.testbed2 2013-12-11
 fm.libre.droid_3.apk fm.libre.droid 2010-11-12
 fm.libre.droid_4.apk fm.libre.droid 2010-11-12
 fr.bellev.stdatmosphere_1.apk fr.bellev.stdatmosphere 2012-12-14
@@ -1447,6 +1760,12 @@ fr.keuse.rightsalert_2.apk fr.keuse.rightsalert 2012-05-08
 fr.keuse.rightsalert_3.apk fr.keuse.rightsalert 2012-07-05
 fr.miximum.napply_2.apk fr.miximum.napply 2012-11-13
 fr.seeks_4.apk fr.seeks 2011-05-04
+fr.simon.marquis.preferencesmanager_15.apk fr.simon.marquis.preferencesmanager 2013-12-15
+fr.simon.marquis.preferencesmanager_16.apk fr.simon.marquis.preferencesmanager 2013-12-11
+fr.simon.marquis.secretcodes_6.apk fr.simon.marquis.secretcodes 2013-11-22
+fr.simon.marquis.secretcodes_8.apk fr.simon.marquis.secretcodes 2013-12-17
+fr.simon.marquis.secretcodes_9.apk fr.simon.marquis.secretcodes 2014-01-09
+fr.strasweb.asso_2.apk fr.strasweb.asso 2013-12-11
 fr.strasweb.browserquest_3.apk fr.strasweb.browserquest 2013-03-19
 fr.strasweb.campus_4.apk fr.strasweb.campus 2013-03-27
 fr.xgouchet.texteditor_13.apk fr.xgouchet.texteditor 2012-09-07
@@ -1462,28 +1781,46 @@ fr.ybo.transportsrennes_345.apk fr.ybo.transportsrennes 2013-08-12
 fr.ybo.transportsrennes_347.apk fr.ybo.transportsrennes 2013-08-20
 fr.ybo.transportsrennes_348.apk fr.ybo.transportsrennes 2013-10-08
 fr.ybo.transportsrennes_349.apk fr.ybo.transportsrennes 2013-10-23
+fr.ybo.transportsrennes_351.apk fr.ybo.transportsrennes 2013-10-28
+fr.ybo.transportsrennes_352.apk fr.ybo.transportsrennes 2013-11-04
+fr.ybo.transportsrennes_353.apk fr.ybo.transportsrennes 2013-11-27
+fr.ybo.transportsrennes_354.apk fr.ybo.transportsrennes 2014-01-15
+fr.ybo.transportsrennes_355.apk fr.ybo.transportsrennes 2014-01-15
+free.yhc.netmbuddy_29.apk free.yhc.netmbuddy 2013-12-09
 genius.mohammad.floating.stickies_27.apk genius.mohammad.floating.stickies 2013-06-22
 github.daneren2005.dsub_39.apk github.daneren2005.dsub 2013-03-26
 github.daneren2005.dsub_40.apk github.daneren2005.dsub 2013-04-08
 github.daneren2005.dsub_43.apk github.daneren2005.dsub 2013-05-04
 github.daneren2005.dsub_54.apk github.daneren2005.dsub 2013-07-03
+github.daneren2005.dsub_59.apk github.daneren2005.dsub 2013-11-05
+github.daneren2005.dsub_77.apk github.daneren2005.dsub 2013-12-27
+github.daneren2005.dsub_80.apk github.daneren2005.dsub 2014-01-15
 goo.TeaTimer_9.apk goo.TeaTimer 2011-05-18
 gr.ndre.scuttloid_1.apk gr.ndre.scuttloid 2013-05-04
+gr.tsagi.jekyllforandroid_1.apk gr.tsagi.jekyllforandroid 2013-12-09
 gvSIG_Mini_1_0_0_SDK16.apk es.prodevelop.gvsig.mini 2010-10-21
 gvSIG_Mini_1_1_0_SDK16.apk es.prodevelop.gvsig.mini
 gvSIG_Mini_1_2_2_SDK16-456.apk es.prodevelop.gvsig.mini 2011-03-28
 gvsig-2.0-alpha.apk es.prodevelop.gvsig.mini 2012-04-08
+headrevision.BehatReporter_5.apk headrevision.BehatReporter 2014-01-07
 home.jmstudios.calc_14.apk home.jmstudios.calc 2013-10-21
+home.jmstudios.calc_15.apk home.jmstudios.calc 2013-10-29
+home.jmstudios.calc_16.apk home.jmstudios.calc 2013-10-31
+home.jmstudios.calc_17.apk home.jmstudios.calc 2013-11-15
 hsware.HSTempo_17.apk hsware.HSTempo 2013-04-04
 httpmon.apk org.jtb.httpmon 2010-11-21
 httpmon_0.4.10.apk org.jtb.httpmon
 hu.vsza.adsdroid_1.apk hu.vsza.adsdroid 2012-09-07
 hu.vsza.adsdroid_2.apk hu.vsza.adsdroid 2012-10-11
 hu.vsza.adsdroid_3.apk hu.vsza.adsdroid 2013-02-02
+hu.vsza.adsdroid_5.apk hu.vsza.adsdroid 2013-11-10
 i4nc4mp.myLock_26.apk i4nc4mp.myLock 2012-08-29
 i4nc4mp.myLock_28.apk i4nc4mp.myLock 2012-09-15
+in.ac.dtu.subtlenews_10.apk in.ac.dtu.subtlenews 2014-01-15
+in.ac.dtu.subtlenews_7.apk in.ac.dtu.subtlenews 2014-01-14
 in.shick.diode_11.apk in.shick.diode 2013-04-07
 in.shick.diode_12.apk in.shick.diode 2013-08-16
+in.shick.diode_13.apk in.shick.diode 2014-01-15
 in.shick.diode_5.apk in.shick.diode 2012-07-01
 in.shick.diode_6.apk in.shick.diode 2012-09-07
 in.shick.diode_7.apk in.shick.diode 2013-01-02
@@ -1491,18 +1828,23 @@ in.shick.diode_8.apk in.shick.diode 2013-03-01
 in.shick.diode_9.apk in.shick.diode 2013-03-26
 in.shick.lockpatterngenerator_6.apk in.shick.lockpatterngenerator 2012-06-21
 in.shick.lockpatterngenerator_7.apk in.shick.lockpatterngenerator 2013-02-02
+in.shick.lockpatterngenerator_8.apk in.shick.lockpatterngenerator 2013-12-02
+in.shick.lockpatterngenerator_9.apk in.shick.lockpatterngenerator 2013-12-04
 info.guardianproject.browser_15.apk info.guardianproject.browser 2012-08-23
 info.guardianproject.browser_18.apk info.guardianproject.browser 2012-09-28
 info.guardianproject.browser_3.apk info.guardianproject.browser 2011-12-07
 info.guardianproject.cacert_3.apk info.guardianproject.cacert 2011-10-03
 info.guardianproject.cacert_4.apk info.guardianproject.cacert 2011-12-11
 info.guardianproject.cacert_5.apk info.guardianproject.cacert 2013-07-30
+info.guardianproject.gpg_3.apk info.guardianproject.gpg 2013-11-11
 info.guardianproject.lildebi_10.apk info.guardianproject.lildebi 2013-09-28
+info.guardianproject.lildebi_11.apk info.guardianproject.lildebi 2014-01-11
 info.guardianproject.lildebi_3.apk info.guardianproject.lildebi 2012-09-07
 info.guardianproject.lildebi_4.apk info.guardianproject.lildebi 2013-02-11
 info.guardianproject.lildebi_7.apk info.guardianproject.lildebi 2013-05-16
 info.guardianproject.lildebi_8.apk info.guardianproject.lildebi 2013-06-22
 info.guardianproject.lildebi_9.apk info.guardianproject.lildebi 2013-07-24
+info.guardianproject.notepadbot_12.apk info.guardianproject.notepadbot 2013-12-15
 info.guardianproject.otr.app.im_25.apk info.guardianproject.otr.app.im 2012-01-22
 info.guardianproject.otr.app.im_31.apk info.guardianproject.otr.app.im 2012-05-20
 info.guardianproject.otr.app.im_34.apk info.guardianproject.otr.app.im 2012-08-23
@@ -1510,6 +1852,7 @@ info.guardianproject.otr.app.im_35.apk info.guardianproject.otr.app.im 2012-08-2
 info.guardianproject.otr.app.im_37.apk info.guardianproject.otr.app.im 2012-10-05
 info.guardianproject.otr.app.im_41.apk info.guardianproject.otr.app.im 2012-12-01
 info.guardianproject.otr.app.im_57.apk info.guardianproject.otr.app.im 2013-06-05
+info.guardianproject.pixelknot_4.apk info.guardianproject.pixelknot 2013-12-15
 info.lamatricexiste.network_42.apk info.lamatricexiste.network 2011-07-06
 info.lamatricexiste.network_43.apk info.lamatricexiste.network 2012-02-04
 info.staticfree.SuperGenPass_17.apk info.staticfree.SuperGenPass 2012-08-29
@@ -1525,8 +1868,10 @@ info.staticfree.android.units_8.apk info.staticfree.android.units 2011-01-17
 info.staticfree.android.units_9.apk info.staticfree.android.units 2012-02-16
 info.toyonos.hfr4droid_51.apk info.toyonos.hfr4droid 2012-08-29
 info.toyonos.hfr4droid_61.apk info.toyonos.hfr4droid 2012-08-29
+io.github.sanbeg.flashlight_1.apk io.github.sanbeg.flashlight 2014-01-07
 it.devapp.android_1.apk it.devapp.android 2012-09-07
 it.ecosw.dudo_13.apk it.ecosw.dudo 2013-09-06
+it.ecosw.dudo_14.apk it.ecosw.dudo 2013-10-28
 it.ecosw.dudo_9.apk it.ecosw.dudo 2013-07-05
 it.gmariotti.android.apps.dashclock.extensions.battery_19.apk it.gmariotti.android.apps.dashclock.extensions.battery 2013-06-22
 it.iiizio.epubator_10.apk it.iiizio.epubator 2012-09-28
@@ -1534,6 +1879,7 @@ it.iiizio.epubator_11.apk it.iiizio.epubator 2013-02-02
 it.iiizio.epubator_12.apk it.iiizio.epubator 2013-06-30
 it.iiizio.epubator_7.apk it.iiizio.epubator 2012-09-18
 it.iiizio.epubator_9.apk it.iiizio.epubator 2012-09-19
+it.mn.salvi.linuxDayOSM_5.apk it.mn.salvi.linuxDayOSM 2014-01-07
 it.sasabz.android.sasabus_17.apk it.sasabz.android.sasabus 2012-10-10
 it.sasabz.android.sasabus_18.apk it.sasabz.android.sasabus 2012-10-10
 it.sasabz.android.sasabus_19.apk it.sasabz.android.sasabus 2012-11-30
@@ -1552,6 +1898,7 @@ jackpal.androidterm_51.apk jackpal.androidterm 2013-01-02
 jackpal.androidterm_52.apk jackpal.androidterm 2013-01-21
 jackpal.androidterm_53.apk jackpal.androidterm 2013-01-28
 jackpal.androidterm_54.apk jackpal.androidterm 2013-05-29
+jackpal.androidterm_55.apk jackpal.androidterm 2013-11-18
 jackpal.droidexaminer_1.apk jackpal.droidexaminer 2013-06-24
 jp.co.kayo.android.localplayer.ds.ampache_410044.apk jp.co.kayo.android.localplayer.ds.ampache 2012-08-09
 jp.co.kayo.android.localplayer.ds.ampache_410047.apk jp.co.kayo.android.localplayer.ds.ampache 2012-10-27
@@ -1579,6 +1926,7 @@ jp.sblo.pandora.aGrep_11.apk jp.sblo.pandora.aGrep 2012-11-30
 jp.sblo.pandora.aGrep_4.apk jp.sblo.pandora.aGrep 2012-09-08
 jp.sfjp.webglmol.NDKmol_14.apk jp.sfjp.webglmol.NDKmol 2012-09-07
 jp.sfjp.webglmol.NDKmol_15.apk jp.sfjp.webglmol.NDKmol 2013-02-04
+jp.softstudio.DriversLicenseReader_5.apk jp.softstudio.DriversLicenseReader 2014-01-07
 jpf.android.diary_1.apk jpf.android.diary 2013-10-24
 jupiter.broadcasting.live.tv_5.apk jupiter.broadcasting.live.tv 2012-09-14
 jupiter.broadcasting.live.tv_8.apk jupiter.broadcasting.live.tv 2013-04-08
@@ -1618,6 +1966,7 @@ kr.hybdms.sidepanel_10.apk kr.hybdms.sidepanel 2013-03-22
 kr.hybdms.sidepanel_11.apk kr.hybdms.sidepanel 2013-03-26
 kr.hybdms.sidepanel_12.apk kr.hybdms.sidepanel 2013-04-12
 kr.hybdms.sidepanel_13.apk kr.hybdms.sidepanel 2013-04-25
+kr.softgear.multiping_11.apk kr.softgear.multiping 2013-12-09
 li.klass.fhem_128.apk li.klass.fhem 2013-04-25
 li.klass.fhem_141.apk li.klass.fhem 2013-07-11
 li.klass.fhem_51.apk li.klass.fhem 2012-02-15
@@ -1646,6 +1995,7 @@ me.kuehle.carreport_8.apk me.kuehle.carreport 2012-08-23
 me.kuehle.carreport_9.apk me.kuehle.carreport 2012-10-22
 me.malladi.dashcricket_3.apk me.malladi.dashcricket 2013-03-17
 me.malladi.dashcricket_4.apk me.malladi.dashcricket 2013-03-30
+me.malladi.dashcricket_5.apk me.malladi.dashcricket 2013-11-22
 me.shkschneider.dropbearserver2_154.apk me.shkschneider.dropbearserver2 2013-03-23
 mixare-0061.apk org.mixare
 mixare-0062.apk org.mixare
@@ -1666,6 +2016,7 @@ mohammad.adib.roundr_18.apk mohammad.adib.roundr 2013-04-25
 mohammad.adib.roundr_19.apk mohammad.adib.roundr 2013-05-04
 mohammad.adib.roundr_22.apk mohammad.adib.roundr 2013-06-07
 mohammad.adib.roundr_24.apk mohammad.adib.roundr 2013-06-19
+monakhv.android.samlib_19.apk monakhv.android.samlib 2013-12-15
 mustard-0.1.10.apk org.mustard.android
 mustard-0.1.12b.apk org.mustard.android
 mustard-0.1.12c.apk org.mustard.android
@@ -1683,8 +2034,15 @@ mustard-0.3.4.apk org.mustard.android 2012-10-26
 mustard-0.4.0beta8.apk org.mustard.android 2012-09-10
 mythmote-1.5.1.apk tkj.android.homecontrol.mythmote
 name.bagi.levente.pedometer_6.apk name.bagi.levente.pedometer 2011-08-14
+name.boyle.chris.sgtpuzzles_72.apk name.boyle.chris.sgtpuzzles 2014-01-08
+name.juodumas.ext_kbd_lithuanian_1.apk name.juodumas.ext_kbd_lithuanian 2014-01-09
 name.livitski.games.puzzle.android_2.apk name.livitski.games.puzzle.android 2013-10-20
+name.soulayrol.rhaa.sholi_1.apk name.soulayrol.rhaa.sholi 2013-12-09
+name.soulayrol.rhaa.sholi_2.apk name.soulayrol.rhaa.sholi 2013-12-17
 navit-0.2.0.apk org.navitproject.navit 2011-01-02
+nerd.tuxmobil.fahrplan.congress_25.apk nerd.tuxmobil.fahrplan.congress 2013-12-28
+nerd.tuxmobil.fahrplan.congress_27.apk nerd.tuxmobil.fahrplan.congress 2013-12-29
+nerd.tuxmobil.fahrplan.congress_29.apk nerd.tuxmobil.fahrplan.congress 2014-01-02
 net.aangle.rvclock_7.apk net.aangle.rvclock 2013-06-22
 net.androgames.level_27.apk net.androgames.level 2012-01-11
 net.androgames.level_29.apk net.androgames.level 2012-02-21
@@ -1701,6 +2059,7 @@ net.bible.android.activity_107.apk net.bible.android.activity 2013-07-17
 net.bible.android.activity_79.apk net.bible.android.activity 2012-08-23
 net.bible.android.activity_83.apk net.bible.android.activity 2012-09-07
 net.bible.android.activity_93.apk net.bible.android.activity 2013-02-07
+net.bluetoothviewer_2.apk net.bluetoothviewer 2014-01-07
 net.bytten.xkcdviewer_15.apk net.bytten.xkcdviewer 2011-01-26
 net.bytten.xkcdviewer_17.apk net.bytten.xkcdviewer 2011-04-06
 net.bytten.xkcdviewer_21.apk net.bytten.xkcdviewer 2011-07-22
@@ -1724,6 +2083,8 @@ net.czlee.debatekeeper_16.apk net.czlee.debatekeeper 2013-07-11
 net.dahanne.android.regalandroid_5.apk net.dahanne.android.regalandroid 2013-05-09
 net.dahanne.banq.notifications_2.apk net.dahanne.banq.notifications 2013-09-06
 net.dahanne.banq.notifications_3.apk net.dahanne.banq.notifications 2013-09-23
+net.debian.debiandroid_12.apk net.debian.debiandroid 2013-12-15
+net.debian.debiandroid_13.apk net.debian.debiandroid 2013-12-24
 net.everythingandroid.smspopup_123.apk net.everythingandroid.smspopup 2012-09-07
 net.everythingandroid.smspopup_124.apk net.everythingandroid.smspopup 2012-09-11
 net.fercanet.LNM_3.apk net.fercanet.LNM 2011-01-20
@@ -1744,6 +2105,12 @@ net.fred.feedex_24.apk net.fred.feedex 2013-09-10
 net.fred.feedex_27.apk net.fred.feedex 2013-09-21
 net.fred.feedex_28.apk net.fred.feedex 2013-09-28
 net.fred.feedex_29.apk net.fred.feedex 2013-10-02
+net.fred.feedex_30.apk net.fred.feedex 2013-11-17
+net.fred.feedex_31.apk net.fred.feedex 2013-11-18
+net.fred.feedex_32.apk net.fred.feedex 2013-11-19
+net.fred.feedex_33.apk net.fred.feedex 2013-11-22
+net.fred.feedex_34.apk net.fred.feedex 2013-11-26
+net.fred.feedex_35.apk net.fred.feedex 2013-12-29
 net.fred.feedex_9.apk net.fred.feedex 2013-05-29
 net.gaast.giggity_16.apk net.gaast.giggity 2012-01-28
 net.gaast.giggity_21.apk net.gaast.giggity 2012-11-08
@@ -1756,6 +2123,11 @@ net.gorry.android.input.nicownng_201211251.apk net.gorry.android.input.nicownng
 net.gorry.android.input.nicownng_201304231.apk net.gorry.android.input.nicownng 2013-04-24
 net.gorry.android.input.nicownng_201304251.apk net.gorry.android.input.nicownng 2013-05-25
 net.healeys.lexic_41.apk net.healeys.lexic 2012-02-09
+net.i2p.android.router_0.apk net.i2p.android.router 2013-10-30
+net.i2p.android.router_4734976.apk net.i2p.android.router 2013-11-08
+net.i2p.android.router_4737024.apk net.i2p.android.router 2013-12-11
+net.imatruck.betterweather_34.apk net.imatruck.betterweather 2014-01-14
+net.imatruck.betterweather_35.apk net.imatruck.betterweather 2014-01-15
 net.iowaline.dotdash_10.apk net.iowaline.dotdash 2012-04-13
 net.iowaline.dotdash_11.apk net.iowaline.dotdash 2012-04-25
 net.iowaline.dotdash_12.apk net.iowaline.dotdash 2012-09-15
@@ -1766,11 +2138,17 @@ net.kervala.comicsreader_13.apk net.kervala.comicsreader 2013-01-02
 net.kervala.comicsreader_15.apk net.kervala.comicsreader 2013-02-07
 net.kervala.comicsreader_17.apk net.kervala.comicsreader 2013-07-31
 net.kervala.comicsreader_2.apk net.kervala.comicsreader 2012-09-07
+net.lardcave.keepassnfc_1.apk net.lardcave.keepassnfc 2014-01-09
+net.logomancy.dashquotes.civ5_1.apk net.logomancy.dashquotes.civ5 2013-12-09
 net.logomancy.diedroid_8.apk net.logomancy.diedroid 2012-09-08
 net.logomancy.diedroid_9.apk net.logomancy.diedroid 2013-01-18
 net.luniks.android.inetify_16.apk net.luniks.android.inetify 2012-09-07
+net.luniks.android.inetify_18.apk net.luniks.android.inetify 2013-11-13
 net.mafro.android.wakeonlan_12.apk net.mafro.android.wakeonlan 2011-11-24
 net.mafro.android.wakeonlan_13.apk net.mafro.android.wakeonlan 2012-08-23
+net.majorkernelpanic.spydroid_420.apk net.majorkernelpanic.spydroid 2013-12-09
+net.majorkernelpanic.spydroid_690.apk net.majorkernelpanic.spydroid 2013-12-09
+net.majorkernelpanic.spydroid_910.apk net.majorkernelpanic.spydroid 2013-12-09
 net.micode.compass_1.apk net.micode.compass 2012-02-15
 net.micode.fileexplorer_1.apk net.micode.fileexplorer 2012-08-23
 net.micode.soundrecorder_1.apk net.micode.soundrecorder 2012-08-29
@@ -1783,6 +2161,8 @@ net.nightwhistler.pageturner_2.apk net.nightwhistler.pageturner 2012-02-04
 net.nightwhistler.pageturner_24.apk net.nightwhistler.pageturner 2013-02-02
 net.nightwhistler.pageturner_25.apk net.nightwhistler.pageturner 2013-03-09
 net.nightwhistler.pageturner_3.apk net.nightwhistler.pageturner 2012-02-11
+net.nightwhistler.pageturner_56.apk net.nightwhistler.pageturner 2013-11-18
+net.nightwhistler.pageturner_58.apk net.nightwhistler.pageturner 2013-12-27
 net.nightwhistler.pageturner_6.apk net.nightwhistler.pageturner 2012-03-06
 net.nightwhistler.pageturner_8.apk net.nightwhistler.pageturner 2012-04-18
 net.nurik.roman.dashclock_14.apk net.nurik.roman.dashclock 2013-02-28
@@ -1803,6 +2183,8 @@ net.osmand.plus_65.apk net.osmand.plus 2012-08-29
 net.osmand.plus_71.apk net.osmand.plus 2012-08-30
 net.osmand_25.apk net.osmand 2011-02-11
 net.osmand_26.apk net.osmand 2011-06-24
+net.pejici.summation_1.apk net.pejici.summation 2014-01-09
+net.phunehehe.foocam_2.apk net.phunehehe.foocam 2013-10-29
 net.pierrox.mcompass_10.apk net.pierrox.mcompass 2012-01-21
 net.pmarks.chromadoze_10.apk net.pmarks.chromadoze 2013-04-25
 net.pmarks.chromadoze_12.apk net.pmarks.chromadoze 2013-10-22
@@ -1857,9 +2239,13 @@ net.rocrail.androc_401.apk net.rocrail.androc 2013-05-08
 net.rocrail.androc_407.apk net.rocrail.androc 2013-06-03
 net.rocrail.androc_409.apk net.rocrail.androc 2013-06-04
 net.rocrail.androc_414.apk net.rocrail.androc 2013-07-24
+net.rocrail.androc_418.apk net.rocrail.androc 2013-11-13
 net.sf.andbatdog.batterydog_11.apk net.sf.andbatdog.batterydog 2011-04-02
 net.sf.andhsli.hotspotlogin_16.apk net.sf.andhsli.hotspotlogin 2012-09-11
 net.sf.andhsli.hotspotlogin_20.apk net.sf.andhsli.hotspotlogin 2013-02-28
+net.sf.times_22.apk net.sf.times 2013-12-09
+net.sf.times_23.apk net.sf.times 2013-12-11
+net.somethingdreadful.MAL_12.apk net.somethingdreadful.MAL 2014-01-07
 net.sourceforge.andsys_11.apk net.sourceforge.andsys 2013-04-05
 net.sourceforge.andsys_12.apk net.sourceforge.andsys 2013-04-12
 net.sourceforge.andsys_15.apk net.sourceforge.andsys 2013-04-16
@@ -1887,6 +2273,10 @@ net.sourceforge.servestream_72.apk net.sourceforge.servestream 2013-05-02
 net.sourceforge.servestream_78.apk net.sourceforge.servestream 2013-08-27
 net.sourceforge.subsonic.androidapp_46.apk net.sourceforge.subsonic.androidapp 2012-09-07
 net.sourceforge.subsonic.androidapp_51.apk net.sourceforge.subsonic.androidapp 2013-05-28
+net.sourceforge.subsonic.androidapp_53.apk net.sourceforge.subsonic.androidapp 2013-11-10
+net.sourceforge.subsonic.androidapp_54.apk net.sourceforge.subsonic.androidapp 2014-01-16
+net.sourceforge.wifiremoteplay_7.apk net.sourceforge.wifiremoteplay 2013-10-31
+net.sourceforge.wifiremoteplay_8.apk net.sourceforge.wifiremoteplay 2013-12-27
 net.sylvek.sharemyposition_16.apk net.sylvek.sharemyposition 2011-02-03
 net.sylvek.sharemyposition_20.apk net.sylvek.sharemyposition 2012-01-10
 net.sylvek.sharemyposition_24.apk net.sylvek.sharemyposition 2012-01-27
@@ -1903,6 +2293,7 @@ net.tedstein.AndroSS_17.apk net.tedstein.AndroSS 2012-02-03
 net.tedstein.AndroSS_6.apk net.tedstein.AndroSS 2011-03-29
 net.tedstein.AndroSS_7.apk net.tedstein.AndroSS 2011-04-19
 net.tedstein.AndroSS_8.apk net.tedstein.AndroSS 2011-05-05
+net.tevp.postcode_2.apk net.tevp.postcode 2013-12-30
 net.thauvin.erik.android.noussd_1.apk net.thauvin.erik.android.noussd 2012-09-28
 net.thauvin.erik.android.noussd_2.apk net.thauvin.erik.android.noussd 2012-10-03
 net.vivekiyer.GAL_14.apk net.vivekiyer.GAL 2012-09-09
@@ -1911,14 +2302,27 @@ net.vivekiyer.GAL_23.apk net.vivekiyer.GAL 2012-11-13
 net.vivekiyer.GAL_24.apk net.vivekiyer.GAL 2013-07-08
 net.wigle.wigleandroid_53.apk net.wigle.wigleandroid 2012-10-16
 net.wigle.wigleandroid_55.apk net.wigle.wigleandroid 2013-02-10
+net.wigle.wigleandroid_57.apk net.wigle.wigleandroid 2014-01-14
 net.xenotropic.quizznworldcap_1.apk net.xenotropic.quizznworldcap 2013-08-18
+nf.frex.android_10.apk nf.frex.android 2013-12-15
 nitezh.ministock_50.apk nitezh.ministock 2013-06-24
 nitezh.ministock_51.apk nitezh.ministock 2013-07-04
+nitezh.ministock_52.apk nitezh.ministock 2013-12-07
+nl.frankkie.bronylivewallpaper_8.apk nl.frankkie.bronylivewallpaper 2014-01-14
+nl.frankkie.bronylivewallpaper_9.apk nl.frankkie.bronylivewallpaper 2014-01-14
+nl.mpcjanssen.simpletask_1053.apk nl.mpcjanssen.simpletask 2013-12-04
+nl.mpcjanssen.simpletask_1054.apk nl.mpcjanssen.simpletask 2013-12-07
+nl.mpcjanssen.simpletask_1058.apk nl.mpcjanssen.simpletask 2013-12-11
+nl.mpcjanssen.simpletask_1060.apk nl.mpcjanssen.simpletask 2013-12-12
+nl.mpcjanssen.simpletask_1062.apk nl.mpcjanssen.simpletask 2013-12-15
+nl.mpcjanssen.simpletask_1067.apk nl.mpcjanssen.simpletask 2013-12-31
+nl.mpcjanssen.simpletask_1069.apk nl.mpcjanssen.simpletask 2014-01-07
 nl.ttys0.simplec25k_7.apk nl.ttys0.simplec25k 2012-10-01
 nl.ttys0.simplec25k_8.apk nl.ttys0.simplec25k 2012-10-05
 no.rkkc.bysykkel_25.apk no.rkkc.bysykkel 2012-07-01
 no.rkkc.bysykkel_26.apk no.rkkc.bysykkel 2013-05-25
 nu.firetech.android.pactrack_1310.apk nu.firetech.android.pactrack 2011-01-27
+nz.gen.geek_central.ObjViewer_1.apk nz.gen.geek_central.ObjViewer 2014-01-07
 orbitlivewallpaperfree.puzzleduck.com_1.apk orbitlivewallpaperfree.puzzleduck.com 2012-08-23
 orbitlivewallpaperfree.puzzleduck.com_3.apk orbitlivewallpaperfree.puzzleduck.com 2012-08-29
 orbitlivewallpaperfree.puzzleduck.com_4.apk orbitlivewallpaperfree.puzzleduck.com 2012-10-11
@@ -1954,6 +2358,7 @@ org.addhen.smssync_11.apk org.addhen.smssync 2012-09-07
 org.addhen.smssync_12.apk org.addhen.smssync 2012-10-16
 org.addhen.smssync_14.apk org.addhen.smssync 2013-03-30
 org.addhen.smssync_15.apk org.addhen.smssync 2013-07-05
+org.addhen.smssync_20.apk org.addhen.smssync 2013-11-16
 org.adw.launcher_34.apk org.adw.launcher 2011-12-05
 org.aja.flightmode_2.apk org.aja.flightmode 2013-06-26
 org.aja.flightmode_3.apk org.aja.flightmode 2013-07-30
@@ -1981,6 +2386,12 @@ org.andstatus.app_77.apk org.andstatus.app 2013-07-14
 org.andstatus.app_78.apk org.andstatus.app 2013-10-01
 org.andstatus.app_79.apk org.andstatus.app 2013-10-06
 org.andstatus.app_81.apk org.andstatus.app 2013-10-24
+org.andstatus.app_83.apk org.andstatus.app 2013-10-29
+org.andstatus.app_84.apk org.andstatus.app 2013-11-06
+org.andstatus.app_85.apk org.andstatus.app 2013-11-22
+org.andstatus.app_86.apk org.andstatus.app 2013-12-04
+org.andstatus.app_89.apk org.andstatus.app 2013-12-11
+org.andstatus.app_91.apk org.andstatus.app 2013-12-31
 org.ardour_1.apk org.ardour 2012-10-10
 org.balau.fakedawn_2.apk org.balau.fakedawn 2013-01-02
 org.balau.fakedawn_3.apk org.balau.fakedawn 2013-01-19
@@ -2017,6 +2428,8 @@ org.brandroid.openmanager_208.apk org.brandroid.openmanager 2013-01-29
 org.brandroid.openmanager_212.apk org.brandroid.openmanager 2013-02-21
 org.broeuschmeul.android.gps.bluetooth.provider_125.apk org.broeuschmeul.android.gps.bluetooth.provider 2012-08-23
 org.broeuschmeul.android.gps.bluetooth.provider_126.apk org.broeuschmeul.android.gps.bluetooth.provider 2013-09-27
+org.chrisbailey.todo_10.apk org.chrisbailey.todo 2013-10-30
+org.congresointeractivo.elegilegi_1.apk org.congresointeractivo.elegilegi 2013-12-09
 org.connectbot_365.apk org.connectbot 2013-05-13
 org.coolreader_103.apk org.coolreader 2011-02-13
 org.coolreader_109.apk org.coolreader 2011-03-03
@@ -2061,28 +2474,39 @@ org.coolreader_847.apk org.coolreader 2013-01-02
 org.coolreader_86.apk org.coolreader 2011-01-31
 org.coolreader_94.apk org.coolreader 2011-02-02
 org.coolreader_96.apk org.coolreader 2011-02-08
+org.cprados.wificellmanager_18.apk org.cprados.wificellmanager 2014-01-07
 org.crocodile.sbautologin_10.apk org.crocodile.sbautologin 2012-11-08
 org.crocodile.sbautologin_21.apk org.crocodile.sbautologin 2013-02-02
 org.cry.otp_20.apk org.cry.otp 2012-08-23
 org.curiouscreature.android.shelves_1.apk org.curiouscreature.android.shelves 2011-01-27
 org.damazio.notifier_11.apk org.damazio.notifier 2011-01-31
+org.dgtale.icsimport_1.apk org.dgtale.icsimport 2013-11-13
+org.dgtale.icsimport_2.apk org.dgtale.icsimport 2014-01-15
 org.diygenomics.pg_6.apk org.diygenomics.pg 2013-01-23
 org.dmfs.tasks_10.apk org.dmfs.tasks 2013-07-09
 org.dmfs.tasks_15.apk org.dmfs.tasks 2013-09-20
 org.dnaq.dialer2_17.apk org.dnaq.dialer2 2012-03-02
+org.dolphinemu.dolphinemu_11.apk org.dolphinemu.dolphinemu 2013-10-28
 org.dpadgett.timer_2.apk org.dpadgett.timer 2012-09-25
+org.dpadgett.timer_7.apk org.dpadgett.timer 2013-11-19
 org.droidparts.battery_widget_201205220.apk org.droidparts.battery_widget 2012-08-13
 org.droidseries_12.apk org.droidseries 2011-03-02
 org.droidseries_13.apk org.droidseries 2011-11-28
+org.droidupnp_6.apk org.droidupnp 2013-12-09
 org.dsandler.apps.markers_36.apk org.dsandler.apps.markers 2012-08-29
 org.dsandler.apps.markers_37.apk org.dsandler.apps.markers 2012-08-29
 org.dsandler.apps.markers_39.apk org.dsandler.apps.markers 2012-11-30
 org.dsandler.apps.markers_40.apk org.dsandler.apps.markers 2013-03-27
+org.dsandler.apps.markers_51.apk org.dsandler.apps.markers 2013-11-22
+org.dsandler.apps.markers_52.apk org.dsandler.apps.markers 2013-12-03
+org.dsandler.apps.markers_55.apk org.dsandler.apps.markers 2014-01-04
+org.durka.hallmonitor_3.apk org.durka.hallmonitor 2013-12-23
 org.dynalogin.android_2.apk org.dynalogin.android 2012-09-07
 org.dyndns.fules.ck_16.apk org.dyndns.fules.ck 2012-10-10
 org.dyndns.fules.ck_17.apk org.dyndns.fules.ck 2012-10-08
 org.dyndns.fules.ck_19.apk org.dyndns.fules.ck 2013-07-05
 org.dyndns.ipignoli.petronius_4.apk org.dyndns.ipignoli.petronius 2012-08-29
+org.dyndns.sven_ola.debian_kit_5.apk org.dyndns.sven_ola.debian_kit 2014-01-03
 org.eehouse.android.xw4_26.apk org.eehouse.android.xw4 2012-01-13
 org.eehouse.android.xw4_30.apk org.eehouse.android.xw4 2012-01-13
 org.eehouse.android.xw4_31.apk org.eehouse.android.xw4 2012-01-13
@@ -2097,11 +2521,14 @@ org.epstudios.epmobile_25.apk org.epstudios.epmobile 2013-03-19
 org.epstudios.epmobile_26.apk org.epstudios.epmobile 2013-04-08
 org.epstudios.epmobile_27.apk org.epstudios.epmobile 2013-06-19
 org.epstudios.epmobile_29.apk org.epstudios.epmobile 2013-07-22
+org.epstudios.epmobile_30.apk org.epstudios.epmobile 2014-01-15
 org.epstudios.morbidmeter_4.apk org.epstudios.morbidmeter 2012-08-23
+org.evilsoft.pathfinder.reference_19.apk org.evilsoft.pathfinder.reference 2014-01-07
 org.example.pushupbuddy_1.apk org.example.pushupbuddy 2011-10-17
 org.fastergps_1.apk org.fastergps 2012-02-24
 org.fastergps_11.apk org.fastergps 2013-09-03
 org.fastergps_12.apk org.fastergps 2013-10-13
+org.fastergps_13.apk org.fastergps 2013-12-15
 org.fastergps_3.apk org.fastergps 2012-03-01
 org.fastergps_4.apk org.fastergps 2012-04-08
 org.fastergps_5.apk org.fastergps 2012-05-08
@@ -2140,6 +2567,11 @@ org.fdroid.fdroid_50.apk org.fdroid.fdroid 2013-08-20
 org.fdroid.fdroid_51.apk org.fdroid.fdroid 2013-09-22
 org.fdroid.fdroid_52.apk org.fdroid.fdroid 2013-09-30
 org.fdroid.fdroid_53.apk org.fdroid.fdroid 2013-10-24
+org.fdroid.fdroid_540.apk org.fdroid.fdroid 2013-11-05
+org.fdroid.fdroid_550.apk org.fdroid.fdroid 2013-11-11
+org.fdroid.fdroid_560.apk org.fdroid.fdroid 2013-12-26
+org.fdroid.fdroid_570.apk org.fdroid.fdroid 2014-01-08
+org.fdroid.fdroid_580.apk org.fdroid.fdroid 2014-01-11
 org.fdroid.fdroid_8.apk org.fdroid.fdroid 2011-01-17
 org.fdroid.fdroid_9.apk org.fdroid.fdroid 2011-01-30
 org.fdroid.k9_16025.apk org.fdroid.k9 2013-06-30
@@ -2153,6 +2585,7 @@ org.fdroid.superuser_1013.apk org.fdroid.superuser 2013-03-07
 org.fdroid.superuser_1016.apk org.fdroid.superuser 2013-03-30
 org.fdroid.superuser_1017.apk org.fdroid.superuser 2013-04-12
 org.fdroid.taskstrid_170.apk org.fdroid.taskstrid 2011-01-15
+org.fedorahosted.freeotp_11.apk org.fedorahosted.freeotp 2013-12-22
 org.fosdem_4.apk org.fosdem 2011-02-04
 org.fosdem_50.apk org.fosdem 2013-02-02
 org.fox.ttrss_105.apk org.fox.ttrss 2012-09-21
@@ -2191,6 +2624,7 @@ org.fox.ttrss_97.apk org.fox.ttrss 2012-09-10
 org.fox.ttrss_98.apk org.fox.ttrss 2012-09-15
 org.gc.networktester_2.apk org.gc.networktester 2012-08-29
 org.gege.caldavsyncadapter_15.apk org.gege.caldavsyncadapter 2013-10-03
+org.gege.caldavsyncadapter_18.apk org.gege.caldavsyncadapter 2013-11-22
 org.gege.caldavsyncadapter_7.apk org.gege.caldavsyncadapter 2013-03-16
 org.gege.caldavsyncadapter_8.apk org.gege.caldavsyncadapter 2013-04-07
 org.geometerplus.fbreader.plugin.local_opds_scanner_101001.apk org.geometerplus.fbreader.plugin.local_opds_scanner 2013-07-02
@@ -2241,11 +2675,13 @@ org.gnucash.android_10.apk org.gnucash.android 2013-06-24
 org.gnucash.android_13.apk org.gnucash.android 2013-08-29
 org.gnucash.android_14.apk org.gnucash.android 2013-09-06
 org.gnucash.android_2.apk org.gnucash.android 2012-11-07
+org.gnucash.android_22.apk org.gnucash.android 2013-12-31
 org.gnucash.android_3.apk org.gnucash.android 2012-11-10
 org.gnucash.android_4.apk org.gnucash.android 2013-01-29
 org.gnucash.android_6.apk org.gnucash.android 2013-02-07
 org.gnucash.android_7.apk org.gnucash.android 2013-02-07
 org.gnucash.android_8.apk org.gnucash.android 2013-06-22
+org.hanenoshino.onscripter_20120310.apk org.hanenoshino.onscripter 2013-10-29
 org.helllabs.android.xmp_15.apk org.helllabs.android.xmp 2011-03-02
 org.helllabs.android.xmp_21.apk org.helllabs.android.xmp 2012-03-05
 org.helllabs.android.xmp_30.apk org.helllabs.android.xmp 2012-09-13
@@ -2258,14 +2694,20 @@ org.hermit.tricorder_41.apk org.hermit.tricorder 2013-01-24
 org.herrlado.ask.languagepack.lithuanian_8.apk org.herrlado.ask.languagepack.lithuanian 2013-03-20
 org.herrlado.ask.languagepack.lithuanian_9.apk org.herrlado.ask.languagepack.lithuanian 2013-03-20
 org.herrlado.geofonts_41.apk org.herrlado.geofonts 2013-03-21
+org.hystudio.android.dosbox_20500.apk org.hystudio.android.dosbox 2014-01-03
+org.ironrabbit.bhoboard_12.apk org.ironrabbit.bhoboard 2013-11-08
 org.ironrabbit.bhoboard_8.apk org.ironrabbit.bhoboard 2013-06-25
 org.ironrabbit_6.apk org.ironrabbit 2013-06-25
 org.jamienicol.episodes_2.apk org.jamienicol.episodes 2013-06-15
 org.jamienicol.episodes_3.apk org.jamienicol.episodes 2013-06-27
+org.jamienicol.episodes_4.apk org.jamienicol.episodes 2013-11-10
 org.jessies.dalvikexplorer_33.apk org.jessies.dalvikexplorer 2012-11-12
 org.jessies.dalvikexplorer_34.apk org.jessies.dalvikexplorer 2013-02-11
 org.jessies.dalvikexplorer_35.apk org.jessies.dalvikexplorer 2013-03-23
 org.jessies.dalvikexplorer_36.apk org.jessies.dalvikexplorer 2013-03-27
+org.jessies.dalvikexplorer_37.apk org.jessies.dalvikexplorer 2013-10-30
+org.jessies.dalvikexplorer_38.apk org.jessies.dalvikexplorer 2013-11-16
+org.jessies.dalvikexplorer_39.apk org.jessies.dalvikexplorer 2014-01-07
 org.jessies.mathdroid_25.apk org.jessies.mathdroid 2011-12-06
 org.jessies.mathdroid_26.apk org.jessies.mathdroid 2012-09-07
 org.jessies.mathdroid_27.apk org.jessies.mathdroid 2012-11-05
@@ -2284,6 +2726,8 @@ org.jfedor.frozenbubble_18.apk org.jfedor.frozenbubble 2013-07-02
 org.jfedor.frozenbubble_19.apk org.jfedor.frozenbubble 2013-07-05
 org.jfedor.frozenbubble_20.apk org.jfedor.frozenbubble 2013-07-14
 org.jfedor.frozenbubble_21.apk org.jfedor.frozenbubble 2013-08-15
+org.jfedor.frozenbubble_22.apk org.jfedor.frozenbubble 2013-12-04
+org.jfedor.frozenbubble_23.apk org.jfedor.frozenbubble 2014-01-08
 org.jfedor.frozenbubble_8.apk org.jfedor.frozenbubble 2011-01-02
 org.jfedor.frozenbubble_9.apk org.jfedor.frozenbubble 2011-01-02
 org.jfedor.nxtremotecontrol_5.apk org.jfedor.nxtremotecontrol 2013-03-04
@@ -2299,7 +2743,12 @@ org.jtb.alogcat_43.apk org.jtb.alogcat 2012-04-19
 org.jtb.droidlife_21.apk org.jtb.droidlife 2011-11-27
 org.jtb.droidlife_22.apk org.jtb.droidlife 2012-04-19
 org.jtb.httpmon_26.apk org.jtb.httpmon 2012-08-23
+org.jtb.httpmon_27.apk org.jtb.httpmon 2013-11-13
 org.katsarov.dofcalc_1.apk org.katsarov.dofcalc 2013-09-27
+org.kde.kdeconnect_tp_10.apk org.kde.kdeconnect_tp 2013-11-16
+org.kde.kdeconnect_tp_11.apk org.kde.kdeconnect_tp 2013-11-27
+org.kde.kdeconnect_tp_5.apk org.kde.kdeconnect_tp 2013-10-27
+org.kde.kdeconnect_tp_9.apk org.kde.kdeconnect_tp 2013-11-05
 org.kde.necessitas.ministro_6.apk org.kde.necessitas.ministro 2012-08-29
 org.kde.necessitas.ministro_7.apk org.kde.necessitas.ministro 2012-11-05
 org.kontalk_21.apk org.kontalk 2013-03-20
@@ -2316,14 +2765,17 @@ org.kwaak3.ext_1.apk org.kwaak3 2012-12-22
 org.kwaak3_1.apk org.kwaak3 2013-06-27
 org.liberty.android.fantastischmemo_135.apk org.liberty.android.fantastischmemo 2012-02-12
 org.liberty.android.fantastischmemo_182.apk org.liberty.android.fantastischmemo 2013-06-05
+org.liberty.android.fantastischmemo_188.apk org.liberty.android.fantastischmemo 2013-10-29
 org.ligi.fast_18.apk org.ligi.fast 2012-09-08
 org.ligi.fast_29.apk org.ligi.fast 2013-02-04
 org.ligi.fast_33.apk org.ligi.fast 2013-02-22
 org.ligi.fast_37.apk org.ligi.fast 2013-03-21
 org.ligi.fast_42.apk org.ligi.fast 2013-10-02
 org.ligi.fast_43.apk org.ligi.fast 2013-10-04
+org.ligi.fast_49.apk org.ligi.fast 2014-01-16
 org.linphone_2003.apk org.linphone 2013-05-11
 org.linphone_2120.apk org.linphone 2013-07-28
+org.logicallycreative.movingpolygons_4.apk org.logicallycreative.movingpolygons 2014-01-09
 org.lumicall.android_118.apk org.lumicall.android 2012-09-07
 org.lumicall.android_120.apk org.lumicall.android 2012-10-17
 org.lumicall.android_121.apk org.lumicall.android 2012-10-17
@@ -2338,6 +2790,10 @@ org.lumicall.android_145.apk org.lumicall.android 2013-07-11
 org.macno.puma_10.apk org.macno.puma 2013-07-19
 org.macno.puma_11.apk org.macno.puma 2013-07-22
 org.macno.puma_12.apk org.macno.puma 2013-08-29
+org.macno.puma_13.apk org.macno.puma 2013-12-10
+org.macno.puma_14.apk org.macno.puma 2013-12-11
+org.macno.puma_15.apk org.macno.puma 2013-12-11
+org.macno.puma_16.apk org.macno.puma 2013-12-13
 org.macno.puma_5.apk org.macno.puma 2013-06-27
 org.macno.puma_6.apk org.macno.puma 2013-06-27
 org.macno.puma_7.apk org.macno.puma 2013-06-28
@@ -2356,12 +2812,21 @@ org.mariotaku.twidere_39.apk org.mariotaku.twidere 2012-09-18
 org.mariotaku.twidere_42.apk org.mariotaku.twidere 2012-09-20
 org.mariotaku.twidere_47.apk org.mariotaku.twidere 2012-10-05
 org.mariotaku.twidere_49.apk org.mariotaku.twidere 2012-10-26
+org.mariotaku.twidere_79.apk org.mariotaku.twidere 2013-11-23
+org.mariotaku.twidere_80.apk org.mariotaku.twidere 2013-11-24
+org.mariotaku.twidere_81.apk org.mariotaku.twidere 2013-12-06
+org.mariotaku.twidere_84.apk org.mariotaku.twidere 2013-12-09
+org.mariotaku.twidere_86.apk org.mariotaku.twidere 2013-12-22
 org.me.tvhguide_1.apk org.me.tvhguide 2012-09-07
 org.me.tvhguide_17.apk org.me.tvhguide 2012-10-22
 org.mixare_14.apk org.mixare 2011-07-22
 org.mixare_20.apk org.mixare 2012-01-28
 org.mixare_26.apk org.mixare 2012-09-07
+org.montrealtransit.android.schedule.stmbus_3.apk org.montrealtransit.android.schedule.stmbus 2013-12-09
+org.montrealtransit.android_886.apk org.montrealtransit.android 2013-12-09
 org.mosspaper_5.apk org.mosspaper 2013-06-24
+org.mozilla.mozstumbler_20.apk org.mozilla.mozstumbler 2014-01-11
+org.mozilla.mozstumbler_21.apk org.mozilla.mozstumbler 2014-01-14
 org.mult.daap_30.apk org.mult.daap 2011-01-27
 org.mult.daap_39.apk org.mult.daap 2012-01-19
 org.mult.daap_40.apk org.mult.daap 2012-02-04
@@ -2369,16 +2834,21 @@ org.mult.daap_45.apk org.mult.daap 2013-03-22
 org.mult.daap_46.apk org.mult.daap 2013-08-15
 org.mumod.android_168.apk org.mumod.android 2013-06-15
 org.musicbrainz.picard.barcodescanner_2.apk org.musicbrainz.picard.barcodescanner 2013-04-26
+org.mustard.android_150.apk org.mustard.android 2013-12-09
 org.mythdroid_4.apk org.mythdroid 2011-03-02
 org.mythdroid_53.apk org.mythdroid 2012-01-06
 org.mythdroid_62.apk org.mythdroid 2013-03-14
 org.mythdroid_63.apk org.mythdroid 2013-10-10
+org.n52.sosmobileclient_12.apk org.n52.sosmobileclient 2013-12-11
 org.nathan.jf.build.prop.editor_3.apk org.nathan.jf.build.prop.editor 2012-10-16
 org.nathan.jf.build.prop.editor_4.apk org.nathan.jf.build.prop.editor 2013-03-12
 org.navitproject.navit_5650.apk org.navitproject.navit 2013-10-16
+org.navitproject.navit_5720.apk org.navitproject.navit 2013-11-27
 org.ncrmnt.nettts_3.apk org.ncrmnt.nettts 2013-03-30
 org.nerdcircus.android.klaxon_27.apk org.nerdcircus.android.klaxon 2012-02-04
 org.nick.wwwjdic_2250.apk org.nick.wwwjdic 2013-01-23
+org.nick.wwwjdic_2330.apk org.nick.wwwjdic 2013-11-13
+org.nick.wwwjdic_2341.apk org.nick.wwwjdic 2014-01-14
 org.npr.android.news_3.apk org.npr.android.news 2013-07-31
 org.ntpsync_1.apk org.ntpsync 2012-05-19
 org.ntpsync_10.apk org.ntpsync 2013-09-03
@@ -2390,9 +2860,12 @@ org.ntpsync_9.apk org.ntpsync 2013-09-02
 org.odk.collect.android_1015.apk org.odk.collect.android 2012-10-10
 org.odk.collect.android_1020.apk org.odk.collect.android 2012-10-27
 org.odk.collect.android_1023.apk org.odk.collect.android 2013-01-02
+org.okfn.pod_13.apk org.okfn.pod 2013-12-09
 org.openbmap_1.apk org.openbmap 2013-08-25
 org.openbmap_2.apk org.openbmap 2013-09-06
 org.openbmap_5.apk org.openbmap 2013-10-14
+org.openbmap_6.apk org.openbmap 2013-11-10
+org.openbmap_7.apk org.openbmap 2013-11-13
 org.opengpx_192.apk org.opengpx 2013-01-30
 org.opengpx_236.apk org.opengpx 2012-07-13
 org.openintents.about_8.apk org.openintents.about 2012-11-01
@@ -2403,6 +2876,7 @@ org.openintents.filemanager_26.apk org.openintents.filemanager 2012-11-12
 org.openintents.filemanager_28.apk org.openintents.filemanager 2013-08-13
 org.openintents.newsreader_65549.apk org.openintents.newsreader 2012-01-30
 org.openlp.android_1.apk org.openlp.android 2013-10-15
+org.openlp.android_7.apk org.openlp.android 2013-10-29
 org.opensatnav.android_199.apk org.opensatnav.android 2011-01-22
 org.passwordmaker.android_7.apk org.passwordmaker.android 2012-08-29
 org.paulmach.textedit_12.apk org.paulmach.textedit 2011-01-27
@@ -2420,12 +2894,14 @@ org.petero.droidfish_52.apk org.petero.droidfish 2012-10-18
 org.petero.droidfish_54.apk org.petero.droidfish 2013-02-07
 org.petero.droidfish_57.apk org.petero.droidfish 2013-05-28
 org.petero.droidfish_59.apk org.petero.droidfish 2013-09-09
+org.petero.droidfish_60.apk org.petero.droidfish 2013-12-02
 org.pocketworkstation.pckeyboard_1018.apk org.pocketworkstation.pckeyboard 2011-07-01
 org.pocketworkstation.pckeyboard_1020.apk org.pocketworkstation.pckeyboard 2011-07-01
 org.pocketworkstation.pckeyboard_1022.apk org.pocketworkstation.pckeyboard 2011-10-02
 org.pocketworkstation.pckeyboard_1029.apk org.pocketworkstation.pckeyboard 2012-01-15
 org.pocketworkstation.pckeyboard_1031.apk org.pocketworkstation.pckeyboard 2012-02-26
 org.pocketworkstation.pckeyboard_1033.apk org.pocketworkstation.pckeyboard 2012-07-12
+org.pocketworkstation.pckeyboard_1037.apk org.pocketworkstation.pckeyboard 2014-01-14
 org.ppsspp.ppsspp_61.apk org.ppsspp.ppsspp 2013-02-08
 org.ppsspp.ppsspp_70.apk org.ppsspp.ppsspp 2013-03-13
 org.ppsspp.ppsspp_75.apk org.ppsspp.ppsspp 2013-04-14
@@ -2434,35 +2910,166 @@ org.ppsspp.ppsspp_80.apk org.ppsspp.ppsspp 2013-06-24
 org.ppsspp.ppsspp_81.apk org.ppsspp.ppsspp 2013-06-27
 org.ppsspp.ppsspp_90.apk org.ppsspp.ppsspp 2013-08-21
 org.ppsspp.ppsspp_91.apk org.ppsspp.ppsspp 2013-08-23
+org.ppsspp.ppsspp_951.apk org.ppsspp.ppsspp 2013-11-13
+org.ppsspp.ppsspp_953.apk org.ppsspp.ppsspp 2013-11-08
+org.ppsspp.ppsspp_961.apk org.ppsspp.ppsspp 2013-12-13
+org.ppsspp.ppsspp_963.apk org.ppsspp.ppsspp 2013-12-13
 org.primftpd_2.apk org.primftpd 2013-03-05
 org.projectmaxs.main_1.apk org.projectmaxs.main 2013-10-10
+org.projectmaxs.main_10.apk org.projectmaxs.main 2013-12-22
+org.projectmaxs.main_11.apk org.projectmaxs.main 2014-01-07
+org.projectmaxs.main_12.apk org.projectmaxs.main 2014-01-09
 org.projectmaxs.main_2.apk org.projectmaxs.main 2013-10-14
+org.projectmaxs.main_3.apk org.projectmaxs.main 2013-10-25
+org.projectmaxs.main_4.apk org.projectmaxs.main 2013-11-03
+org.projectmaxs.main_6.apk org.projectmaxs.main 2013-11-13
+org.projectmaxs.main_7.apk org.projectmaxs.main 2013-11-15
+org.projectmaxs.main_8.apk org.projectmaxs.main 2013-11-22
+org.projectmaxs.main_9.apk org.projectmaxs.main 2013-12-01
 org.projectmaxs.module.bluetooth_1.apk org.projectmaxs.module.bluetooth 2013-10-10
+org.projectmaxs.module.bluetooth_10.apk org.projectmaxs.module.bluetooth 2013-12-22
+org.projectmaxs.module.bluetooth_11.apk org.projectmaxs.module.bluetooth 2014-01-07
+org.projectmaxs.module.bluetooth_12.apk org.projectmaxs.module.bluetooth 2014-01-09
 org.projectmaxs.module.bluetooth_2.apk org.projectmaxs.module.bluetooth 2013-10-14
+org.projectmaxs.module.bluetooth_3.apk org.projectmaxs.module.bluetooth 2013-10-25
+org.projectmaxs.module.bluetooth_4.apk org.projectmaxs.module.bluetooth 2013-11-03
+org.projectmaxs.module.bluetooth_6.apk org.projectmaxs.module.bluetooth 2013-11-13
+org.projectmaxs.module.bluetooth_7.apk org.projectmaxs.module.bluetooth 2013-11-15
+org.projectmaxs.module.bluetooth_8.apk org.projectmaxs.module.bluetooth 2013-11-22
+org.projectmaxs.module.bluetooth_9.apk org.projectmaxs.module.bluetooth 2013-12-01
 org.projectmaxs.module.bluetoothadmin_1.apk org.projectmaxs.module.bluetoothadmin 2013-10-10
+org.projectmaxs.module.bluetoothadmin_10.apk org.projectmaxs.module.bluetoothadmin 2013-12-22
+org.projectmaxs.module.bluetoothadmin_11.apk org.projectmaxs.module.bluetoothadmin 2014-01-07
+org.projectmaxs.module.bluetoothadmin_12.apk org.projectmaxs.module.bluetoothadmin 2014-01-09
 org.projectmaxs.module.bluetoothadmin_2.apk org.projectmaxs.module.bluetoothadmin 2013-10-14
+org.projectmaxs.module.bluetoothadmin_3.apk org.projectmaxs.module.bluetoothadmin 2013-10-25
+org.projectmaxs.module.bluetoothadmin_4.apk org.projectmaxs.module.bluetoothadmin 2013-11-03
+org.projectmaxs.module.bluetoothadmin_6.apk org.projectmaxs.module.bluetoothadmin 2013-11-13
+org.projectmaxs.module.bluetoothadmin_7.apk org.projectmaxs.module.bluetoothadmin 2013-11-15
+org.projectmaxs.module.bluetoothadmin_8.apk org.projectmaxs.module.bluetoothadmin 2013-11-22
+org.projectmaxs.module.bluetoothadmin_9.apk org.projectmaxs.module.bluetoothadmin 2013-12-01
 org.projectmaxs.module.clipboard_1.apk org.projectmaxs.module.clipboard 2013-10-10
+org.projectmaxs.module.clipboard_10.apk org.projectmaxs.module.clipboard 2013-12-22
+org.projectmaxs.module.clipboard_11.apk org.projectmaxs.module.clipboard 2014-01-07
+org.projectmaxs.module.clipboard_12.apk org.projectmaxs.module.clipboard 2014-01-09
 org.projectmaxs.module.clipboard_2.apk org.projectmaxs.module.clipboard 2013-10-14
+org.projectmaxs.module.clipboard_3.apk org.projectmaxs.module.clipboard 2013-10-25
+org.projectmaxs.module.clipboard_4.apk org.projectmaxs.module.clipboard 2013-11-03
+org.projectmaxs.module.clipboard_6.apk org.projectmaxs.module.clipboard 2013-11-13
+org.projectmaxs.module.clipboard_7.apk org.projectmaxs.module.clipboard 2013-11-15
+org.projectmaxs.module.clipboard_8.apk org.projectmaxs.module.clipboard 2013-11-22
+org.projectmaxs.module.clipboard_9.apk org.projectmaxs.module.clipboard 2013-12-01
 org.projectmaxs.module.contactsread_1.apk org.projectmaxs.module.contactsread 2013-10-10
+org.projectmaxs.module.contactsread_10.apk org.projectmaxs.module.contactsread 2013-12-22
+org.projectmaxs.module.contactsread_11.apk org.projectmaxs.module.contactsread 2014-01-07
+org.projectmaxs.module.contactsread_12.apk org.projectmaxs.module.contactsread 2014-01-09
 org.projectmaxs.module.contactsread_2.apk org.projectmaxs.module.contactsread 2013-10-14
+org.projectmaxs.module.contactsread_3.apk org.projectmaxs.module.contactsread 2013-10-25
+org.projectmaxs.module.contactsread_4.apk org.projectmaxs.module.contactsread 2013-11-03
+org.projectmaxs.module.contactsread_6.apk org.projectmaxs.module.contactsread 2013-11-13
+org.projectmaxs.module.contactsread_7.apk org.projectmaxs.module.contactsread 2013-11-15
+org.projectmaxs.module.contactsread_8.apk org.projectmaxs.module.contactsread 2013-11-22
+org.projectmaxs.module.contactsread_9.apk org.projectmaxs.module.contactsread 2013-12-01
 org.projectmaxs.module.fileread_1.apk org.projectmaxs.module.fileread 2013-10-10
+org.projectmaxs.module.fileread_10.apk org.projectmaxs.module.fileread 2013-12-22
+org.projectmaxs.module.fileread_11.apk org.projectmaxs.module.fileread 2014-01-07
+org.projectmaxs.module.fileread_12.apk org.projectmaxs.module.fileread 2014-01-09
 org.projectmaxs.module.fileread_2.apk org.projectmaxs.module.fileread 2013-10-14
+org.projectmaxs.module.fileread_3.apk org.projectmaxs.module.fileread 2013-10-25
+org.projectmaxs.module.fileread_4.apk org.projectmaxs.module.fileread 2013-11-03
+org.projectmaxs.module.fileread_6.apk org.projectmaxs.module.fileread 2013-11-13
+org.projectmaxs.module.fileread_7.apk org.projectmaxs.module.fileread 2013-11-15
+org.projectmaxs.module.fileread_8.apk org.projectmaxs.module.fileread 2013-11-22
+org.projectmaxs.module.fileread_9.apk org.projectmaxs.module.fileread 2013-12-01
 org.projectmaxs.module.filewrite_1.apk org.projectmaxs.module.filewrite 2013-10-10
+org.projectmaxs.module.filewrite_10.apk org.projectmaxs.module.filewrite 2013-12-22
+org.projectmaxs.module.filewrite_11.apk org.projectmaxs.module.filewrite 2014-01-07
+org.projectmaxs.module.filewrite_12.apk org.projectmaxs.module.filewrite 2014-01-09
 org.projectmaxs.module.filewrite_2.apk org.projectmaxs.module.filewrite 2013-10-14
+org.projectmaxs.module.filewrite_3.apk org.projectmaxs.module.filewrite 2013-10-25
+org.projectmaxs.module.filewrite_4.apk org.projectmaxs.module.filewrite 2013-11-03
+org.projectmaxs.module.filewrite_6.apk org.projectmaxs.module.filewrite 2013-11-13
+org.projectmaxs.module.filewrite_7.apk org.projectmaxs.module.filewrite 2013-11-15
+org.projectmaxs.module.filewrite_8.apk org.projectmaxs.module.filewrite 2013-11-22
+org.projectmaxs.module.filewrite_9.apk org.projectmaxs.module.filewrite 2013-12-01
 org.projectmaxs.module.phonestateread_1.apk org.projectmaxs.module.phonestateread 2013-10-10
+org.projectmaxs.module.phonestateread_10.apk org.projectmaxs.module.phonestateread 2013-12-22
+org.projectmaxs.module.phonestateread_11.apk org.projectmaxs.module.phonestateread 2014-01-07
+org.projectmaxs.module.phonestateread_12.apk org.projectmaxs.module.phonestateread 2014-01-09
 org.projectmaxs.module.phonestateread_2.apk org.projectmaxs.module.phonestateread 2013-10-14
+org.projectmaxs.module.phonestateread_3.apk org.projectmaxs.module.phonestateread 2013-10-25
+org.projectmaxs.module.phonestateread_4.apk org.projectmaxs.module.phonestateread 2013-11-03
+org.projectmaxs.module.phonestateread_6.apk org.projectmaxs.module.phonestateread 2013-11-13
+org.projectmaxs.module.phonestateread_7.apk org.projectmaxs.module.phonestateread 2013-11-15
+org.projectmaxs.module.phonestateread_8.apk org.projectmaxs.module.phonestateread 2013-11-22
+org.projectmaxs.module.phonestateread_9.apk org.projectmaxs.module.phonestateread 2013-12-01
 org.projectmaxs.module.ringermode_1.apk org.projectmaxs.module.ringermode 2013-10-10
+org.projectmaxs.module.ringermode_10.apk org.projectmaxs.module.ringermode 2013-12-22
+org.projectmaxs.module.ringermode_11.apk org.projectmaxs.module.ringermode 2014-01-07
+org.projectmaxs.module.ringermode_12.apk org.projectmaxs.module.ringermode 2014-01-09
 org.projectmaxs.module.ringermode_2.apk org.projectmaxs.module.ringermode 2013-10-14
+org.projectmaxs.module.ringermode_3.apk org.projectmaxs.module.ringermode 2013-10-25
+org.projectmaxs.module.ringermode_4.apk org.projectmaxs.module.ringermode 2013-11-03
+org.projectmaxs.module.ringermode_6.apk org.projectmaxs.module.ringermode 2013-11-13
+org.projectmaxs.module.ringermode_7.apk org.projectmaxs.module.ringermode 2013-11-15
+org.projectmaxs.module.ringermode_8.apk org.projectmaxs.module.ringermode 2013-11-22
+org.projectmaxs.module.ringermode_9.apk org.projectmaxs.module.ringermode 2013-12-01
 org.projectmaxs.module.smsnotify_1.apk org.projectmaxs.module.smsnotify 2013-10-10
+org.projectmaxs.module.smsnotify_10.apk org.projectmaxs.module.smsnotify 2013-12-22
+org.projectmaxs.module.smsnotify_11.apk org.projectmaxs.module.smsnotify 2014-01-07
+org.projectmaxs.module.smsnotify_12.apk org.projectmaxs.module.smsnotify 2014-01-09
 org.projectmaxs.module.smsnotify_2.apk org.projectmaxs.module.smsnotify 2013-10-14
+org.projectmaxs.module.smsnotify_3.apk org.projectmaxs.module.smsnotify 2013-10-25
+org.projectmaxs.module.smsnotify_4.apk org.projectmaxs.module.smsnotify 2013-11-03
+org.projectmaxs.module.smsnotify_6.apk org.projectmaxs.module.smsnotify 2013-11-13
+org.projectmaxs.module.smsnotify_7.apk org.projectmaxs.module.smsnotify 2013-11-15
+org.projectmaxs.module.smsnotify_8.apk org.projectmaxs.module.smsnotify 2013-11-22
+org.projectmaxs.module.smsnotify_9.apk org.projectmaxs.module.smsnotify 2013-12-01
 org.projectmaxs.module.smsread_1.apk org.projectmaxs.module.smsread 2013-10-10
+org.projectmaxs.module.smsread_10.apk org.projectmaxs.module.smsread 2013-12-22
+org.projectmaxs.module.smsread_11.apk org.projectmaxs.module.smsread 2014-01-07
+org.projectmaxs.module.smsread_12.apk org.projectmaxs.module.smsread 2014-01-09
 org.projectmaxs.module.smsread_2.apk org.projectmaxs.module.smsread 2013-10-14
+org.projectmaxs.module.smsread_3.apk org.projectmaxs.module.smsread 2013-10-25
+org.projectmaxs.module.smsread_4.apk org.projectmaxs.module.smsread 2013-11-03
+org.projectmaxs.module.smsread_6.apk org.projectmaxs.module.smsread 2013-11-13
+org.projectmaxs.module.smsread_7.apk org.projectmaxs.module.smsread 2013-11-15
+org.projectmaxs.module.smsread_8.apk org.projectmaxs.module.smsread 2013-11-22
+org.projectmaxs.module.smsread_9.apk org.projectmaxs.module.smsread 2013-12-01
 org.projectmaxs.module.smssend_1.apk org.projectmaxs.module.smssend 2013-10-10
+org.projectmaxs.module.smssend_10.apk org.projectmaxs.module.smssend 2013-12-22
+org.projectmaxs.module.smssend_11.apk org.projectmaxs.module.smssend 2014-01-07
+org.projectmaxs.module.smssend_12.apk org.projectmaxs.module.smssend 2014-01-09
 org.projectmaxs.module.smssend_2.apk org.projectmaxs.module.smssend 2013-10-14
+org.projectmaxs.module.smssend_3.apk org.projectmaxs.module.smssend 2013-10-25
+org.projectmaxs.module.smssend_4.apk org.projectmaxs.module.smssend 2013-11-03
+org.projectmaxs.module.smssend_5.apk org.projectmaxs.module.smssend 2013-11-13
+org.projectmaxs.module.smssend_6.apk org.projectmaxs.module.smssend 2013-11-13
+org.projectmaxs.module.smssend_7.apk org.projectmaxs.module.smssend 2013-11-15
+org.projectmaxs.module.smssend_8.apk org.projectmaxs.module.smssend 2013-11-22
+org.projectmaxs.module.smssend_9.apk org.projectmaxs.module.smssend 2013-12-01
 org.projectmaxs.module.smswrite_1.apk org.projectmaxs.module.smswrite 2013-10-10
+org.projectmaxs.module.smswrite_10.apk org.projectmaxs.module.smswrite 2013-12-22
+org.projectmaxs.module.smswrite_11.apk org.projectmaxs.module.smswrite 2014-01-07
+org.projectmaxs.module.smswrite_12.apk org.projectmaxs.module.smswrite 2014-01-09
 org.projectmaxs.module.smswrite_2.apk org.projectmaxs.module.smswrite 2013-10-14
+org.projectmaxs.module.smswrite_3.apk org.projectmaxs.module.smswrite 2013-10-25
+org.projectmaxs.module.smswrite_4.apk org.projectmaxs.module.smswrite 2013-11-03
+org.projectmaxs.module.smswrite_6.apk org.projectmaxs.module.smswrite 2013-11-13
+org.projectmaxs.module.smswrite_7.apk org.projectmaxs.module.smswrite 2013-11-15
+org.projectmaxs.module.smswrite_8.apk org.projectmaxs.module.smswrite 2013-11-22
+org.projectmaxs.module.smswrite_9.apk org.projectmaxs.module.smswrite 2013-12-01
 org.projectmaxs.transport.xmpp_1.apk org.projectmaxs.transport.xmpp 2013-10-10
+org.projectmaxs.transport.xmpp_10.apk org.projectmaxs.transport.xmpp 2013-12-22
+org.projectmaxs.transport.xmpp_11.apk org.projectmaxs.transport.xmpp 2014-01-07
+org.projectmaxs.transport.xmpp_12.apk org.projectmaxs.transport.xmpp 2014-01-09
 org.projectmaxs.transport.xmpp_2.apk org.projectmaxs.transport.xmpp 2013-10-14
+org.projectmaxs.transport.xmpp_3.apk org.projectmaxs.transport.xmpp 2013-10-25
+org.projectmaxs.transport.xmpp_4.apk org.projectmaxs.transport.xmpp 2013-11-03
+org.projectmaxs.transport.xmpp_6.apk org.projectmaxs.transport.xmpp 2013-11-13
+org.projectmaxs.transport.xmpp_7.apk org.projectmaxs.transport.xmpp 2013-11-15
+org.projectmaxs.transport.xmpp_8.apk org.projectmaxs.transport.xmpp 2013-11-22
+org.projectmaxs.transport.xmpp_9.apk org.projectmaxs.transport.xmpp 2013-12-01
 org.projectvoodoo.audiomeasurementsplayer_8.apk org.projectvoodoo.audiomeasurementsplayer 2012-08-23
 org.projectvoodoo.otarootkeeper_10.apk org.projectvoodoo.otarootkeeper 2013-01-21
 org.projectvoodoo.screentestpatterns_10.apk org.projectvoodoo.screentestpatterns 2013-03-05
@@ -2471,6 +3078,9 @@ org.projectvoodoo.screentestpatterns_7.apk org.projectvoodoo.screentestpatterns
 org.projectvoodoo.simplecarrieriqdetector_16.apk org.projectvoodoo.simplecarrieriqdetector 2012-07-26
 org.pulpdust.lesserpad_10.apk org.pulpdust.lesserpad 2013-08-06
 org.pulpdust.lesserpad_11.apk org.pulpdust.lesserpad 2013-10-01
+org.pulpdust.lesserpad_13.apk org.pulpdust.lesserpad 2013-11-17
+org.pulpdust.lesserpad_14.apk org.pulpdust.lesserpad 2013-11-27
+org.pulpdust.lesserpad_15.apk org.pulpdust.lesserpad 2014-01-15
 org.pulpdust.lesserpad_6.apk org.pulpdust.lesserpad 2013-03-22
 org.pulpdust.lesserpad_7.apk org.pulpdust.lesserpad 2013-05-04
 org.pulpdust.lesserpad_8.apk org.pulpdust.lesserpad 2013-06-19
@@ -2479,6 +3089,8 @@ org.pyload.android.client_12.apk org.pyload.android.client 2012-07-13
 org.pyload.android.client_15.apk org.pyload.android.client 2013-02-24
 org.pyload.android.client_16.apk org.pyload.android.client 2013-03-13
 org.pyload.android.client_17.apk org.pyload.android.client 2013-07-04
+org.pyload.android.client_18.apk org.pyload.android.client 2013-11-24
+org.pyload.android.client_19.apk org.pyload.android.client 2013-12-02
 org.qii.weiciyuan_23.apk org.qii.weiciyuan 2012-12-14
 org.qii.weiciyuan_25.apk org.qii.weiciyuan 2013-02-04
 org.quantumbadger.redreader_15.apk org.quantumbadger.redreader 2013-04-07
@@ -2496,6 +3108,8 @@ org.quantumbadger.redreader_39.apk org.quantumbadger.redreader 2013-07-04
 org.quantumbadger.redreader_40.apk org.quantumbadger.redreader 2013-07-28
 org.quantumbadger.redreader_42.apk org.quantumbadger.redreader 2013-08-06
 org.quantumbadger.redreader_43.apk org.quantumbadger.redreader 2013-08-16
+org.quovadit.apps.andof_10.apk org.quovadit.apps.andof 2014-01-15
+org.quovadit.apps.andof_9.apk org.quovadit.apps.andof 2014-01-09
 org.recentwidget_6.apk org.recentwidget 2012-10-10
 org.retroarch_22.apk org.retroarch 2013-09-29
 org.sagemath.droid_4.apk org.sagemath.droid 2012-09-07
@@ -2514,37 +3128,50 @@ org.scoutant.blokish_7.apk org.scoutant.blokish 2011-11-27
 org.scoutant.blokish_8.apk org.scoutant.blokish 2011-11-27
 org.scoutant.blokish_9.apk org.scoutant.blokish 2011-12-31
 org.scoutant.cc_1.apk org.scoutant.cc 2013-01-25
+org.scummvm.scummvm_6.apk org.scummvm.scummvm 2013-10-29
+org.servDroid.web_1000300.apk org.servDroid.web 2013-12-15
 org.servalproject_1929.apk org.servalproject 2013-02-02
 org.servalproject_1947.apk org.servalproject 2013-02-04
 org.servalproject_2117.apk org.servalproject 2013-07-04
 org.servalproject_2120.apk org.servalproject 2013-07-22
 org.sickstache_42.apk org.sickstache 2012-10-10
 org.sickstache_43.apk org.sickstache 2012-10-27
+org.sipdroid.sipua_97.apk org.sipdroid.sipua 2013-11-10
 org.sixgun.ponyexpress_11.apk org.sixgun.ponyexpress 2011-05-25
 org.sixgun.ponyexpress_12.apk org.sixgun.ponyexpress 2011-11-24
 org.sixgun.ponyexpress_5.apk org.sixgun.ponyexpress 2011-01-31
 org.sixgun.ponyexpress_8.apk org.sixgun.ponyexpress 2011-02-09
 org.sixgun.ponyexpress_9.apk org.sixgun.ponyexpress 2011-03-26
 org.smerty.zooborns_14.apk org.smerty.zooborns 2012-09-07
+org.softcatala.traductor_15.apk org.softcatala.traductor 2014-01-09
 org.sparkleshare.android_1.apk org.sparkleshare.android 2012-01-02
 org.subsurface_8.apk org.subsurface 2013-06-17
+org.sudowars_2.apk org.sudowars 2014-01-09
 org.sufficientlysecure.keychain_21000.apk org.sufficientlysecure.keychain 2013-09-11
 org.sufficientlysecure.keychain_21100.apk org.sufficientlysecure.keychain 2013-09-20
 org.sufficientlysecure.localcalendar_1.apk org.sufficientlysecure.localcalendar 2013-03-16
 org.sufficientlysecure.localcalendar_2.apk org.sufficientlysecure.localcalendar 2013-04-16
 org.sufficientlysecure.localcalendar_3.apk org.sufficientlysecure.localcalendar 2013-07-01
 org.sufficientlysecure.localcalendar_4.apk org.sufficientlysecure.localcalendar 2013-10-19
+org.sufficientlysecure.localcalendar_5.apk org.sufficientlysecure.localcalendar 2013-11-22
+org.sufficientlysecure.localcalendar_6.apk org.sufficientlysecure.localcalendar 2013-12-15
+org.sufficientlysecure.standalonecalendar_3.apk org.sufficientlysecure.standalonecalendar 2013-11-13
 org.sufficientlysecure.viewer.fontpack_2100.apk org.sufficientlysecure.viewer.fontpack 2013-08-15
+org.sufficientlysecure.viewer.fontpack_2200.apk org.sufficientlysecure.viewer.fontpack 2013-12-27
 org.sufficientlysecure.viewer_2100.apk org.sufficientlysecure.viewer 2013-07-04
 org.sufficientlysecure.viewer_2200.apk org.sufficientlysecure.viewer 2013-08-15
+org.sufficientlysecure.viewer_2400.apk org.sufficientlysecure.viewer 2013-12-27
+org.systemcall.scores_1.apk org.systemcall.scores 2013-12-09
 org.tamanegi.wallpaper.multipicture.dnt_47.apk org.tamanegi.wallpaper.multipicture.dnt 2013-03-04
 org.tamanegi.wallpaper.multipicture.dnt_48.apk org.tamanegi.wallpaper.multipicture.dnt 2013-03-05
 org.tbrk.mnemododo_23.apk org.tbrk.mnemododo 2013-06-22
 org.thialfihar.android.apg_10900.apk org.thialfihar.android.apg 2013-06-30
+org.thialfihar.android.apg_10999.apk org.thialfihar.android.apg 2013-11-12
 org.thoughtcrime.securesms_21.apk org.thoughtcrime.securesms 2012-01-02
 org.thoughtcrime.securesms_23.apk org.thoughtcrime.securesms 2012-08-23
 org.tigase.messenger.phone.pro_11.apk org.tigase.messenger.phone.pro 2013-10-24
 org.tint.adblock_3.apk org.tint.adblock 2012-10-30
+org.tint_10.apk org.tint 2014-01-07
 org.tint_6.apk org.tint 2012-10-30
 org.tint_7.apk org.tint 2012-11-30
 org.tint_8.apk org.tint 2013-01-10
@@ -2552,10 +3179,17 @@ org.tint_9.apk org.tint 2013-01-28
 org.tof_17.apk org.tof 2012-02-12
 org.tomdroid_10.apk org.tomdroid 2012-09-09
 org.tomdroid_11.apk org.tomdroid 2012-10-24
+org.tomdroid_14.apk org.tomdroid 2014-01-16
 org.tomdroid_6.apk org.tomdroid 2011-01-17
 org.tomdroid_7.apk org.tomdroid 2012-08-03
 org.tomdroid_9.apk org.tomdroid 2013-03-23
 org.torproject.android_51.apk org.torproject.android 2012-12-14
+org.totschnig.myexpenses_102.apk org.totschnig.myexpenses 2013-12-15
+org.totschnig.myexpenses_104.apk org.totschnig.myexpenses 2013-12-18
+org.totschnig.myexpenses_108.apk org.totschnig.myexpenses 2013-12-26
+org.totschnig.myexpenses_110.apk org.totschnig.myexpenses 2014-01-02
+org.totschnig.myexpenses_113.apk org.totschnig.myexpenses 2014-01-08
+org.totschnig.myexpenses_116.apk org.totschnig.myexpenses 2014-01-14
 org.totschnig.myexpenses_33.apk org.totschnig.myexpenses 2012-10-31
 org.totschnig.myexpenses_34.apk org.totschnig.myexpenses 2013-01-02
 org.totschnig.myexpenses_35.apk org.totschnig.myexpenses 2013-01-28
@@ -2566,12 +3200,20 @@ org.totschnig.myexpenses_43.apk org.totschnig.myexpenses 2013-06-02
 org.totschnig.myexpenses_55.apk org.totschnig.myexpenses 2013-07-04
 org.totschnig.myexpenses_63.apk org.totschnig.myexpenses 2013-08-10
 org.totschnig.myexpenses_81.apk org.totschnig.myexpenses 2013-10-22
+org.totschnig.myexpenses_85.apk org.totschnig.myexpenses 2013-11-10
+org.totschnig.myexpenses_87.apk org.totschnig.myexpenses 2013-11-11
+org.totschnig.myexpenses_93.apk org.totschnig.myexpenses 2013-12-02
+org.totschnig.myexpenses_95.apk org.totschnig.myexpenses 2013-12-07
+org.totschnig.myexpenses_97.apk org.totschnig.myexpenses 2013-12-09
 org.totschnig.sendwithftp_7.apk org.totschnig.sendwithftp 2013-03-05
 org.totschnig.sendwithftp_8.apk org.totschnig.sendwithftp 2013-08-03
 org.traccar.client_14.apk org.traccar.client 2013-10-15
+org.transdroid.full_210.apk org.transdroid.full 2013-12-09
+org.transdroid.full_211.apk org.transdroid.full 2013-12-19
 org.transdroid.search_11.apk org.transdroid.search 2012-10-22
 org.transdroid.search_12.apk org.transdroid.search 2013-01-22
 org.transdroid.search_13.apk org.transdroid.search 2013-09-20
+org.transdroid.search_16.apk org.transdroid.search 2013-12-09
 org.transdroid.search_9.apk org.transdroid.search 2012-09-07
 org.transdroid_148.apk org.transdroid 2012-09-30
 org.transdroid_150.apk org.transdroid 2012-10-22
@@ -2611,6 +3253,9 @@ org.ttrssreader_1535.apk org.ttrssreader 2013-08-29
 org.ttrssreader_1600.apk org.ttrssreader 2013-10-09
 org.ttrssreader_1611.apk org.ttrssreader 2013-10-21
 org.ttrssreader_1621.apk org.ttrssreader 2013-10-21
+org.ttrssreader_1700.apk org.ttrssreader 2013-12-21
+org.ttrssreader_1701.apk org.ttrssreader 2013-12-24
+org.ttrssreader_1703.apk org.ttrssreader 2013-12-28
 org.ttrssreader_807.apk org.ttrssreader 2011-01-22
 org.ttrssreader_840.apk org.ttrssreader 2011-02-09
 org.ttrssreader_850.apk org.ttrssreader 2011-06-12
@@ -2638,6 +3283,7 @@ org.vudroid_3.apk org.vudroid 2011-06-12
 org.vudroid_4.apk org.vudroid 2011-06-12
 org.vudroid_5.apk org.vudroid 2011-06-12
 org.wahtod.wififixer_1048.apk org.wahtod.wififixer 2013-09-23
+org.wahtod.wififixer_1065.apk org.wahtod.wififixer 2014-01-16
 org.wahtod.wififixer_620.apk org.wahtod.wififixer 2011-01-26
 org.wahtod.wififixer_758.apk org.wahtod.wififixer 2011-02-10
 org.wahtod.wififixer_759.apk org.wahtod.wififixer 2011-02-11
@@ -2655,6 +3301,7 @@ org.wahtod.wififixer_983.apk org.wahtod.wififixer 2013-04-08
 org.waxworlds.edam.importcontacts_2.apk org.waxworlds.edam.importcontacts 2012-09-26
 org.webodf_3.apk org.webodf 2012-08-23
 org.wheelmap.android.online_16.apk org.wheelmap.android.online 2013-01-28
+org.wikilovesmonuments_13.apk org.wikilovesmonuments 2013-10-31
 org.wikimedia.commons_12.apk org.wikimedia.commons 2013-08-29
 org.wikimedia.commons_14.apk org.wikimedia.commons 2013-10-24
 org.wikimedia.commons_8.apk org.wikimedia.commons 2013-04-23
@@ -2693,6 +3340,7 @@ org.wordpress.android_62.apk org.wordpress.android 2012-11-13
 org.wordpress.android_63.apk org.wordpress.android 2012-12-13
 org.wordpress.android_66.apk org.wordpress.android 2013-02-11
 org.wordpress.android_67.apk org.wordpress.android 2013-04-25
+org.wordpress.android_83.apk org.wordpress.android 2013-11-16
 org.xbmc.android.remote_1009.apk org.xbmc.android.remote 2013-02-08
 org.xbmc.android.remote_730.apk org.xbmc.android.remote 2011-02-24
 org.xbmc.android.remote_768.apk org.xbmc.android.remote 2011-05-18
@@ -2701,6 +3349,7 @@ org.yaaic_10.apk org.yaaic 2011-04-26
 org.yaaic_11.apk org.yaaic 2011-07-22
 org.yaaic_12.apk org.yaaic 2012-08-24
 org.yaaic_9.apk org.yaaic 2011-04-03
+org.yabause.android_1.apk org.yabause.android 2013-11-13
 org.yaxim.androidclient_10.apk org.yaxim.androidclient 2011-09-26
 org.yaxim.androidclient_11.apk org.yaxim.androidclient 2011-10-03
 org.yaxim.androidclient_13.apk org.yaxim.androidclient 2012-02-26
@@ -2723,6 +3372,7 @@ org.yuttadhammo.BodhiTimer_25.apk org.yuttadhammo.BodhiTimer 2013-06-07
 org.yuttadhammo.BodhiTimer_29.apk org.yuttadhammo.BodhiTimer 2013-06-13
 org.yuttadhammo.BodhiTimer_39.apk org.yuttadhammo.BodhiTimer 2013-06-20
 org.yuttadhammo.BodhiTimer_45.apk org.yuttadhammo.BodhiTimer 2013-07-22
+org.yuttadhammo.BodhiTimer_49.apk org.yuttadhammo.BodhiTimer 2013-10-29
 org.yuttadhammo.BodhiTimer_8.apk org.yuttadhammo.BodhiTimer 2012-09-07
 org.yuttadhammo.tipitaka_28.apk org.yuttadhammo.tipitaka 2012-09-07
 org.yuttadhammo.tipitaka_39.apk org.yuttadhammo.tipitaka 2012-10-16
@@ -2733,10 +3383,13 @@ org.yuttadhammo.tipitaka_49.apk org.yuttadhammo.tipitaka 2013-02-11
 org.yuttadhammo.tipitaka_50.apk org.yuttadhammo.tipitaka 2013-02-22
 org.yuttadhammo.tipitaka_51.apk org.yuttadhammo.tipitaka 2013-03-13
 org.yuttadhammo.tipitaka_52.apk org.yuttadhammo.tipitaka 2013-03-15
+org.yuttadhammo.tipitaka_56.apk org.yuttadhammo.tipitaka 2013-10-30
 org.zakky.memopad_3.apk org.zakky.memopad 2012-10-01
 org.zakky.memopad_4.apk org.zakky.memopad 2012-08-23
 org.zeitgeist.movement_24.apk org.zeitgeist.movement 2012-08-29
 org.zeitgeist.movement_25.apk org.zeitgeist.movement 2012-09-25
+org.zephyrsoft.checknetwork_3.apk org.zephyrsoft.checknetwork 2013-12-11
+org.zephyrsoft.trackworktime_14.apk org.zephyrsoft.trackworktime 2013-12-11
 org.zeroxlab.zeroxbenchmark_9.apk org.zeroxlab.zeroxbenchmark 2013-03-27
 org.zirco_10.apk org.zirco 2011-05-01
 org.zirco_11.apk org.zirco 2011-05-16
@@ -2749,9 +3402,14 @@ org.zirco_18.apk org.zirco 2012-05-16
 paulscode.android.mupen64plusae_16.apk paulscode.android.mupen64plusae 2013-03-09
 paulscode.android.mupen64plusae_21.apk paulscode.android.mupen64plusae 2013-03-09
 paulscode.android.mupen64plusae_23.apk paulscode.android.mupen64plusae 2013-03-21
+pe.moe.nori_10.apk pe.moe.nori 2013-12-15
+pe.moe.nori_6.apk pe.moe.nori 2014-01-07
 pl.magot.vetch.ancal_32.apk pl.magot.vetch.ancal 2011-02-01
+pl.nkg.geokrety_12.apk pl.nkg.geokrety 2014-01-09
+priv.twoerner.brightnesswidget_7.apk priv.twoerner.brightnesswidget 2014-01-07
 pro.dbro.bart_11.apk pro.dbro.bart 2013-06-02
 pro.dbro.bart_8.apk pro.dbro.bart 2013-04-13
+pro.oneredpixel.l9droid_3.apk pro.oneredpixel.l9droid 2013-12-09
 pt.isec.tp.am_2.apk pt.isec.tp.am 2012-02-27
 pt.isec.tp.am_4.apk pt.isec.tp.am 2012-03-10
 regalandroid-1.0.0-20101204.212606-5.apk net.dahanne.android.regalandroid 2010-12-16
@@ -2760,6 +3418,7 @@ remuco.client.android_1.apk remuco.client.android 2012-01-08
 ro.ieval.fonbot_1.apk ro.ieval.fonbot 2013-10-16
 ro.ui.pttdroid_2.apk ro.ui.pttdroid 2012-09-07
 ro.ui.pttdroid_3.apk ro.ui.pttdroid 2012-09-07
+ro.ui.pttdroid_4.apk ro.ui.pttdroid 2013-12-12
 ro.weednet.contactssync_32.apk ro.weednet.contactssync 2012-08-29
 ro.weednet.contactssync_33.apk ro.weednet.contactssync 2013-01-10
 ro.weednet.contactssync_39.apk ro.weednet.contactssync 2013-04-29
@@ -2783,12 +3442,21 @@ ru.gelin.android.weather.notification_30.apk ru.gelin.android.weather.notificati
 ru.gelin.android.weather.notification_32.apk ru.gelin.android.weather.notification 2012-10-05
 ru.gelin.android.weather.notification_39.apk ru.gelin.android.weather.notification 2013-02-08
 ru.glesik.nostrangersms_120.apk ru.glesik.nostrangersms 2013-09-06
+ru.glesik.nostrangersms_140.apk ru.glesik.nostrangersms 2013-11-22
+ru.glesik.nostrangersms_141.apk ru.glesik.nostrangersms 2013-12-17
+ru.neverdark.silentnight_6.apk ru.neverdark.silentnight 2013-12-11
+ru.o2genum.coregame_3.apk ru.o2genum.coregame 2013-10-25
 ru.qrck.quitetaskmanager_2.apk ru.qrck.quitetaskmanager 2012-03-02
 ru.ttyh.neko259.notey_3.apk ru.ttyh.neko259.notey 2013-07-11
+ru.valle.btc_170.apk ru.valle.btc 2013-12-09
+ru.valle.btc_190.apk ru.valle.btc 2013-12-31
+ru.valle.btc_201.apk ru.valle.btc 2013-12-31
+ru0xdc.rtkgps_1.apk ru0xdc.rtkgps 2014-01-09
 se.anyro.nfc_reader_10.apk se.anyro.nfc_reader 2012-10-16
 se.anyro.nfc_reader_12.apk se.anyro.nfc_reader 2013-06-02
 se.anyro.nfc_reader_13.apk se.anyro.nfc_reader 2013-07-11
 se.chalmers.doit_1.apk se.chalmers.doit 2012-08-29
+se.danielj.geometridestroyer_2.apk se.danielj.geometridestroyer 2014-01-07
 se.erikofsweden.findmyphone_10.apk se.erikofsweden.findmyphone 2012-09-07
 se.erikofsweden.findmyphone_11.apk se.erikofsweden.findmyphone 2012-11-09
 se.erikofsweden.findmyphone_12.apk se.erikofsweden.findmyphone 2013-07-01
@@ -2797,6 +3465,7 @@ se.johanhil.duckduckgo_1.apk se.johanhil.duckduckgo 2011-03-10
 se.peterbjorkman.android.trafikinfo_12.apk se.peterbjorkman.android.trafikinfo 2011-01-27
 se.peterbjorkman.android.trafikinfo_13.apk se.peterbjorkman.android.trafikinfo 2011-02-02
 se.sandos.android.delayed_18.apk se.sandos.android.delayed 2012-07-26
+seanfoy.wherering_99.apk seanfoy.wherering 2013-11-05
 si.modrajagoda.didi_1.apk si.modrajagoda.didi 2013-06-05
 siir.es.adbWireless_12.apk siir.es.adbWireless 2013-03-12
 sk.madzik.android.logcatudp_5.apk sk.madzik.android.logcatudp 2012-08-23
@@ -2817,6 +3486,8 @@ teaonly.droideye_8.apk teaonly.droideye 2013-06-15
 tkj.android.homecontrol.mythmote_1304.apk tkj.android.homecontrol.mythmote 2012-01-28
 tkj.android.homecontrol.mythmote_1608.apk tkj.android.homecontrol.mythmote 2012-08-02
 tkj.android.homecontrol.mythmote_2308.apk tkj.android.homecontrol.mythmote 2013-02-12
+tkj.android.homecontrol.mythmote_2408.apk tkj.android.homecontrol.mythmote 2014-01-07
+to.doc.android.ipv6config_8.apk to.doc.android.ipv6config 2013-11-24
 to.networld.android.divedroid_1.apk to.networld.android.divedroid 2011-02-13
 transdroid-0.22.0.apk org.transdroid 2010-10-21
 transdroid-0.22.2.apk org.transdroid
@@ -2826,6 +3497,7 @@ transdroid-1.1.0-beta.apk org.transdroid 2011-10-21
 transdroid-1.1.4.apk org.transdroid 2012-08-21
 transdroid-1.1.6.apk org.transdroid 2012-09-07
 trikita.obsqr_10.apk trikita.obsqr 2012-08-23
+trikita.obsqr_11.apk trikita.obsqr 2013-12-09
 trikita.obsqr_9.apk trikita.obsqr 2012-08-23
 tritop.android.SLWTrafficMeterWidget_2.apk tritop.android.SLWTrafficMeterWidget 2012-09-07
 tritop.android.androsens_2.apk tritop.android.androsens 2012-08-23
@@ -2834,18 +3506,27 @@ tuioDroid.impl_4.apk tuioDroid.impl 2011-11-28
 tuioDroid.impl_5.apk tuioDroid.impl 2013-04-04
 tuxrider_1.0.4.apk com.drodin.tuxrider 2010-11-18
 uk.ac.cam.cl.dtg.android.barcodebox_3.apk uk.ac.cam.cl.dtg.android.barcodebox 2012-08-13
+uk.ac.cam.cl.dtg.android.barcodebox_4.apk uk.ac.cam.cl.dtg.android.barcodebox 2013-10-29
+uk.ac.ed.inf.mandelbrotmaps_2.apk uk.ac.ed.inf.mandelbrotmaps 2013-12-15
 uk.co.ashtonbrsc.android.intentintercept_100.apk uk.co.ashtonbrsc.android.intentintercept 2013-01-15
 uk.co.ashtonbrsc.android.intentintercept_101.apk uk.co.ashtonbrsc.android.intentintercept 2013-04-08
+uk.co.ashtonbrsc.android.intentintercept_103.apk uk.co.ashtonbrsc.android.intentintercept 2013-12-24
+uk.co.ashtonbrsc.android.intentintercept_204.apk uk.co.ashtonbrsc.android.intentintercept 2014-01-08
 uk.co.bitethebullet.android.token_4.apk uk.co.bitethebullet.android.token 2013-10-21
+uk.co.danieljarvis.android.flashback_14.apk uk.co.danieljarvis.android.flashback 2013-12-11
+uk.co.danieljarvis.android.flashback_15.apk uk.co.danieljarvis.android.flashback 2013-12-13
 uk.co.jarofgreen.JustADamnCompass_2.apk uk.co.jarofgreen.JustADamnCompass 2012-02-12
 uk.org.cardboardbox.wonderdroid_36.apk uk.org.cardboardbox.wonderdroid 2012-10-21
 uk.org.cardboardbox.wonderdroid_37.apk uk.org.cardboardbox.wonderdroid 2013-03-24
+uk.org.cardboardbox.wonderdroid_39.apk uk.org.cardboardbox.wonderdroid 2013-10-31
 uk.org.ngo.squeezer_12.apk uk.org.ngo.squeezer 2012-12-01
 uk.org.ngo.squeezer_13.apk uk.org.ngo.squeezer 2013-04-08
 urbanstew.RehearsalAssistant_22.apk urbanstew.RehearsalAssistant 2011-02-19
+urbanstew.RehearsalAssistant_26.apk urbanstew.RehearsalAssistant 2014-01-15
 us.bravender.android.dongsa_6.apk us.bravender.android.dongsa 2012-03-06
 us.lindanrandy.cidrcalculator_115.apk us.lindanrandy.cidrcalculator 2012-01-21
 us.lindanrandy.cidrcalculator_118.apk us.lindanrandy.cidrcalculator 2012-01-28
+us.lindanrandy.cidrcalculator_119.apk us.lindanrandy.cidrcalculator 2013-11-04
 ve/0.2.2.14-alpha-orbot-1.0.4.apk org.torproject.android 2013-05-09
 ve/0.2.2.22-alpha-orbot-1.0.4.1.apk org.torproject.android 2013-05-09
 ve/0.2.3.10-alpha-orbot-1.0.7-FINAL.apk org.torproject.android 2013-05-09
@@ -4995,6 +5676,7 @@ vu.de.urpool.quickdroid_47.apk vu.de.urpool.quickdroid 2013-01-10
 vu.de.urpool.quickdroid_49.apk vu.de.urpool.quickdroid 2013-07-18
 wb.receiptspro_12.apk wb.receiptspro 2012-07-01
 wb.receiptspro_80.apk wb.receiptspro 2013-06-24
+wb.receiptspro_82.apk wb.receiptspro 2013-10-27
 yaaic-0.5.apk org.yaaic 2010-10-21
 yaaic-0.6.1.apk org.yaaic
 yaaic-0.6.apk org.yaaic
diff --git a/stats/latestapps.txt b/stats/latestapps.txt
index 50ee485c44..a7ce664177 100644
--- a/stats/latestapps.txt
+++ b/stats/latestapps.txt
@@ -1,10 +1,10 @@
-com.ghostsq.commander.sftp
-com.silentlexx.instead
-com.ghostsq.commander.samba
-uk.co.bitethebullet.android.token
-com.ginkel.hashit
-home.jmstudios.calc
-name.livitski.games.puzzle.android
-com.brianco.colorclock
-ro.ieval.fonbot
-org.traccar.client
+com.android.inputmethod.latin
+com.tkjelectronics.balanduino
+in.ac.dtu.subtlenews
+net.imatruck.betterweather
+nl.frankkie.bronylivewallpaper
+org.mozilla.mozstumbler
+com.studio332.flickit
+org.quovadit.apps.andof
+com.sli.ohmcalc
+pl.nkg.geokrety
diff --git a/stats/licenses.txt b/stats/licenses.txt
index 4f32288c1d..7f2ac0004b 100644
--- a/stats/licenses.txt
+++ b/stats/licenses.txt
@@ -1,21 +1,21 @@
 Public Domain 5
-GPL 32
+GPL 37
 GNUFDL 1
 Artistic Licensev2 1
-GPLv3+ 72
-Unknown 5
-GPLv2 53
-GPLv3 350
+GPLv3+ 81
+Unknown 7
+GPLv2 60
+GPLv3 425
 GPL/MPL 1
-Apache2 213
+Apache2 266
 NYSLv0.9982 1
 EPL 1
-ISC 1
+ISC 2
 Apache2	 1
 NetBSD 1
 GPL/Artistic 2
-AGPL 3
-MIT 44
+AGPL 4
+MIT 65
 CCBYSA 1
 WTFPL 10
 GNUFDL/CCBYSA 1
@@ -24,17 +24,22 @@ Fair License 1
 FreeBSD 2
 BSD 3
 Beer License 2
-GPLv2+ 26
+GPLv2+ 32
+Unlicense/Apache2 1
 Zlib 1
 MPL2 5
+GPLv3 or New BSD 1
 EUPL 1
 NewBSD/GPLv2 1
+LGPLv2.1 1
 AGPLv3 9
-LGPL 12
+Apachev2 1
+LGPL 13
 Custom 1
-NewBSD 25
+NewBSD 30
+MPL 1
 Expat 1
-Unlicense 1
+Unlicense 2
 AGPLv3+ 4
 BSD/Apache 1
 EPLv1 1
diff --git a/stats/repotypes.txt b/stats/repotypes.txt
index 319e31c2ce..4885d63023 100644
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@@ -1,6 +1,5 @@
-svn 59
-none 18
-git 603
+none 14
+git 782
 bzr 12
-git-svn 139
-hg 69
+hg 74
+git-svn 210
diff --git a/stats/total_downloads_app.txt b/stats/total_downloads_app.txt
index 64e1230aef..3a28fde789 100644
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt
@@ -1,861 +1,1052 @@
 # Total downloads by application, since October 2011
-ALL 7626894
-An.stop 7788
-SpeedoMeterApp.main 2207
-a2dp.Vol 5172
-aarddict.android 16798
-acr.browser.barebones 12156
-am.ed.importcontacts 2027
-android.androidVNC 11823
-android.game.prboom 4663
-android.tether 2483
-apps.babycaretimer 1065
-apps.droidnotify 3172
-arity.calculator 11028
-at.bitfire.davdroid 3307
-at.bitfire.gfxtablet 2414
-at.dasz.KolabDroid 1085
-at.tomtasche.reader 3483
-at.univie.sensorium 2507
-at.univie.sensorium.o3gm 1558
-au.com.darkside.XServer 8449
-aws.apps.androidDrawables 3911
-aws.apps.usbDeviceEnumerator 1862
-bander.notepad 6393
-be.ppareit.swiftp_free 11265
-be.quentinloos.manille 558
-biz.codefuture.svgviewer 978
-biz.gyrus.yaab 4196
-budo.budoist 996
-bughunter2.smsfilter 1378
-caldwell.ben.bites 2004
-caldwell.ben.trolly 5457
-campyre.android 799
-cc.co.eurdev.urecorder 3300
-cgeo.geocaching 4572
-ch.blinkenlights.android.apnswitch 2096
-ch.blinkenlights.android.vanilla 11326
-ch.blinkenlights.battery 7961
-ch.fixme.cowsay 2930
-ch.fixme.status 1811
-ch.nexuscomputing.android.osciprimeics 1971
-ch.rrelmy.android.batterymanager 1438
-ch.rrelmy.android.locationcachemap 760
+ALL 12972618
+An.stop 11066
+SpeedoMeterApp.main 2677
+a2dp.Vol 9867
+aarddict.android 23967
+acr.browser.barebones 18420
+am.ed.importcontacts 2738
+android.androidVNC 16055
+android.game.prboom 5584
+android.tether 2501
+app.openconnect 324
+apps.babycaretimer 1464
+apps.droidnotify 3544
+arity.calculator 13774
+at.bitfire.davdroid 31745
+at.bitfire.gfxtablet 3519
+at.dasz.KolabDroid 1616
+at.tomtasche.reader 4803
+at.univie.sensorium 3607
+at.univie.sensorium.o3gm 1559
+au.com.darkside.XServer 10984
+aws.apps.androidDrawables 6069
+aws.apps.usbDeviceEnumerator 2622
+bander.notepad 8906
+be.norio.randomapp 178
+be.ppareit.swiftp_free 14237
+be.quentinloos.manille 1223
+biz.codefuture.svgviewer 1419
+biz.gyrus.yaab 6353
+budo.budoist 1340
+buet.rafi.dictionary 88
+bughunter2.smsfilter 2010
+ca.ddaly.android.heart 940
+caldwell.ben.bites 2484
+caldwell.ben.trolly 6360
+campyre.android 1054
+cc.co.eurdev.urecorder 4157
+cc.rainwave.android 261
+cgeo.geocaching 5484
+ch.blinkenlights.android.apnswitch 3067
+ch.blinkenlights.android.vanilla 13910
+ch.blinkenlights.battery 10046
+ch.fixme.cowsay 3552
+ch.fixme.status 2514
+ch.nexuscomputing.android.osciprimeics 2729
+ch.rrelmy.android.batterymanager 1901
+ch.rrelmy.android.locationcachemap 1040
 cm.aptoide.pt 183
 cmupdaterapp.ui 4693
 com.FireFart.Permissions 2559
-com.FireFart.Permissions2 3760
-com.MarcosDiez.shareviahttp 2833
-com.abcdjdj.rootverifier 4087
-com.achep.widget.jellyclock 3404
-com.adam.aslfms 1451
-com.addi 8322
-com.adstrosoftware.launchappops 1697
+com.FireFart.Permissions2 4857
+com.MarcosDiez.shareviahttp 4473
+com.abcdjdj.rootverifier 7030
+com.achep.widget.jellyclock 4293
+com.adam.aslfms 2016
+com.addi 14277
+com.adstrosoftware.launchappops 2770
 com.agiro.scanner.android 532
-com.alfray.asqare 3930
-com.alfray.mandelbrot2 2776
-com.alfray.timeriffic 2290
-com.amphoras.tpthelper 695
-com.andrew.apollo 18904
-com.andrewshu.android.reddit 2390
-com.android.inputmethod.norwegian 405
-com.android.keepass 19978
-com.android.music 3598
-com.android.quake 5909
-com.android.shellms 963
-com.android2.calculator3 7938
-com.androidemu.gba 11479
-com.androidemu.gbc 6976
-com.androidemu.nes 7025
-com.androzic 2699
-com.andybotting.tramhunter 693
-com.angrydoughnuts.android.alarmclock 10266
-com.anoshenko.android.mahjongg 7775
-com.anysoftkeyboard.languagepack.SSH 3261
-com.anysoftkeyboard.languagepack.catalan 521
-com.anysoftkeyboard.languagepack.danish 414
-com.anysoftkeyboard.languagepack.esperanto 450
-com.anysoftkeyboard.languagepack.french_xlarge 1438
-com.anysoftkeyboard.languagepack.georgian.fdroid 470
-com.anysoftkeyboard.languagepack.greek 507
-com.anysoftkeyboard.languagepack.hebrew_large 494
-com.anysoftkeyboard.languagepack.hungarian 589
-com.anysoftkeyboard.languagepack.malayalam 832
-com.anysoftkeyboard.languagepack.pali 412
-com.anysoftkeyboard.languagepack.persian 584
-com.anysoftkeyboard.languagepack.spain 1164
-com.anysoftkeyboard.languagepack.ukrainian 431
-com.anysoftkeyboard.theme.classic_pc 1307
-com.aokp.backup 647
-com.app2go.sudokufree 3041
-com.appengine.paranoid_android.lost 3757
-com.aripuca.tracker 3625
-com.artifex.mupdfdemo 12462
-com.as.anagramsolver 1149
-com.aselalee.trainschedule 490
-com.asksven.betterbatterystats 8689
-com.ath0.rpn 2575
-com.axelby.podax 3318
-com.banasiak.coinflip 4351
-com.banasiak.coinflipext.example 1704
-com.beem.project.beem 10752
-com.better.alarm 2648
+com.akop.bach 327
+com.alfray.asqare 5439
+com.alfray.mandelbrot2 2793
+com.alfray.timeriffic 2650
+com.amphoras.tpthelper 863
+com.ancantus.HYPNOTOAD 1945
+com.andrew.apollo 28504
+com.andrewshu.android.reddit 2398
+com.android.camera2 2872
+com.android.inputmethod.norwegian 406
+com.android.keepass 24133
+com.android.launcher3 2168
+com.android.music 5909
+com.android.quake 7216
+com.android.shellms 1361
+com.android2.calculator3 9736
+com.androidemu.gba 14529
+com.androidemu.gbc 8983
+com.androidemu.nes 8679
+com.androzic 6886
+com.andybotting.tramhunter 919
+com.angrydoughnuts.android.alarmclock 14627
+com.anoshenko.android.mahjongg 9635
+com.anysoftkeyboard.languagepack.SSH 5144
+com.anysoftkeyboard.languagepack.catalan 1200
+com.anysoftkeyboard.languagepack.danish 897
+com.anysoftkeyboard.languagepack.esperanto 970
+com.anysoftkeyboard.languagepack.french_xlarge 2531
+com.anysoftkeyboard.languagepack.georgian.fdroid 894
+com.anysoftkeyboard.languagepack.greek 1038
+com.anysoftkeyboard.languagepack.hebrew_large 933
+com.anysoftkeyboard.languagepack.hungarian 1814
+com.anysoftkeyboard.languagepack.malayalam 1261
+com.anysoftkeyboard.languagepack.pali 883
+com.anysoftkeyboard.languagepack.persian 1087
+com.anysoftkeyboard.languagepack.spain 2441
+com.anysoftkeyboard.languagepack.ukrainian 890
+com.anysoftkeyboard.theme.classic_pc 2263
+com.aokp.backup 649
+com.app2go.sudokufree 4336
+com.appengine.paranoid_android.lost 4266
+com.aripuca.tracker 5942
+com.ariwilson.seismowallpaper 1141
+com.artifex.mupdfdemo 16550
+com.as.anagramsolver 6122
+com.aselalee.trainschedule 644
+com.asksven.betterbatterystats 11804
+com.asksven.betterwifionoff 1462
+com.ath0.rpn 3129
+com.axelby.podax 5199
+com.banasiak.coinflip 5216
+com.banasiak.coinflipext.example 2108
+com.beem.project.beem 12539
+com.better.alarm 3783
+com.blippex.app 145
+com.blntsoft.emailpopup 254
 com.blogspot.marioboehmer.nfcprofile 48
-com.blogspot.tonyatkins.freespeech 936
-com.boardgamegeek 3918
-com.boombuler.games.shift 2627
-com.boombuler.widgets.contacts 1291
-com.botbrew.basil 2224
-com.bottleworks.dailymoney 2741
-com.brianco.colorclock 131
-com.brocktice.JustSit 1526
-com.brosmike.airpushdetector 6668
-com.btmura.android.reddit 2263
-com.bvalosek.cpuspy 7260
-com.bwx.bequick 4856
+com.blogspot.tonyatkins.freespeech 1283
+com.boardgamegeek 5102
+com.boombuler.games.shift 3411
+com.boombuler.widgets.contacts 1718
+com.botbrew.basil 2890
+com.bottleworks.dailymoney 3539
+com.bretternst.URLazy 196
+com.brewcrewfoo.performance 2356
+com.bri1.soundbored 1808
+com.brianco.colorclock 594
+com.brocktice.JustSit 1947
+com.brosmike.airpushdetector 10180
+com.btmura.android.reddit 3102
+com.bvalosek.cpuspy 9247
+com.bwx.bequick 5670
 com.bwx.qs.battery 2617
-com.byagowi.persiancalendar 1250
-com.casimirlab.simpleDeadlines 2306
-com.cepmuvakkit.times 782
-com.chessclock.android 1660
-com.chmod0.manpages 3297
-com.ciarang.tallyphant 1642
-com.codebutler.farebot 804
-com.colinmcdonough.android.torch 6294
-com.commonsware.android.arXiv 3607
-com.cradle.iitc_mobile 3133
-com.csipsimple 6512
-com.cyanogenmod.filemanager.ics 9277
+com.byagowi.persiancalendar 1729
+com.casimirlab.simpleDeadlines 2890
+com.cepmuvakkit.times 1040
+com.chessclock.android 2052
+com.chmod0.manpages 4033
+com.ciarang.tallyphant 1953
+com.codebutler.farebot 1180
+com.coinbase.android 805
+com.colinmcdonough.android.torch 7935
+com.color.colornamer 719
+com.commonsware.android.arXiv 4971
+com.concentricsky.android.khan 1746
+com.corner23.android.beautyclocklivewallpaper 1443
+com.cr5315.cfdc 540
+com.cradle.iitc_mobile 4405
+com.csipsimple 6521
+com.cyanogenmod.filemanager.ics 15299
+com.cybrosys.palmcalc 1243
 com.danga.squeezer 455
-com.danvelazco.fbwrapper 1043
-com.debian.debiandroid 1216
-com.digitallizard.nicecompass 5715
-com.dngames.mobilewebcam 4888
-com.dougkeen.bart 522
-com.dozingcatsoftware.asciicam 12244
-com.dozingcatsoftware.bouncy 12549
-com.dozingcatsoftware.cameratimer 2115
-com.dozingcatsoftware.dodge 4056
-com.dozuki.ifixit 4615
-com.dririan.RingyDingyDingy 1630
-com.drismo 2258
-com.drodin.tuxrider 12156
-com.droidwave.offlinecalendar 3808
-com.dwalkes.android.toggleheadset2 1276
-com.eddyspace.networkmonitor 1761
-com.eleybourn.bookcatalogue 5354
-com.elsdoerfer.android.autostarts 17843
-com.eolwral.osmonitor 17070
-com.episode6.android.appalarm.pro 2197
-com.evancharlton.mileage 3394
-com.everysoft.autoanswer 2746
-com.example.android.maxpapers 7804
-com.example.anycut 3756
-com.f2prateek.dfg 2047
-com.fivasim.antikythera 4063
-com.frostwire.android 1333
-com.fsck.k9 51601
-com.funambol.androidsync 3859
-com.futonredemption.mylocation 1639
-com.gcstar.scanner 1534
-com.gcstar.viewer 1203
-com.gelakinetic.mtgfam 1447
-com.gh4a 8224
-com.ghostsq.commander 26177
-com.gimranov.zandy.app 920
-com.ginkel.hashit 162
-com.github.andlyticsproject 1886
-com.github.mobile 2204
-com.github.nutomic.controldlna 2374
-com.glTron 7985
-com.gladis.tictactoe 2385
-com.gluegadget.hndroid 2948
-com.gmail.altakey.effy 3567
-com.gmail.charleszq 615
-com.gokhanmoral.stweaks.app 1435
-com.googamaphone.typeandspeak 3445
-com.google.android.apps.authenticator2 2450
-com.google.android.apps.iosched 1206
-com.google.android.diskusage 14667
-com.google.android.maps.mytracks 581
-com.google.android.marvin.talkback 1544
-com.google.android.stardroid 7160
-com.google.code.appsorganizer 6430
-com.google.marvin.shell 3041
-com.google.zxing.client.android 43269
-com.googlecode.android.wifi.tether 2762
+com.danielme.muspyforandroid 200
+com.danvelazco.fbwrapper 2793
+com.darknessmap 522
+com.darshancomputing.BatteryIndicatorPro 1646
+com.dconstructing.cooper 636
+com.debian.debiandroid 1588
+com.digitallizard.nicecompass 6821
+com.dje.openwifinetworkremover 37876
+com.dngames.mobilewebcam 6183
+com.dougkeen.bart 724
+com.dozingcatsoftware.asciicam 18072
+com.dozingcatsoftware.bouncy 15044
+com.dozingcatsoftware.cameratimer 2898
+com.dozingcatsoftware.dodge 5258
+com.dozuki.ifixit 6284
+com.dririan.RingyDingyDingy 1969
+com.drismo 2736
+com.drodin.tuxrider 16249
+com.droidwave.offlinecalendar 3837
+com.duckduckgo.mobile.android 5037
+com.dwak.lastcall 190
+com.dwalkes.android.toggleheadset2 1642
+com.eddyspace.networkmonitor 1769
+com.eleybourn.bookcatalogue 6172
+com.elsdoerfer.android.autostarts 29443
+com.elsewhat.android.currentwallpaper 937
+com.eolwral.osmonitor 29224
+com.episode6.android.appalarm.pro 3476
+com.euedge.openaviationmap.android 379
+com.evancharlton.mileage 3897
+com.everysoft.autoanswer 3340
+com.example.android.maxpapers 9108
+com.example.anycut 5709
+com.f2prateek.dfg 2641
+com.falconware.prestissimo 300
+com.fgrim.msnake 207053
+com.fivasim.antikythera 5809
+com.frankcalise.h2droid 780
+com.frostwire.android 2677
+com.fsck.k9 64661
+com.funambol.androidsync 3957
+com.futonredemption.mylocation 2032
+com.gcstar.scanner 1928
+com.gcstar.viewer 1511
+com.gelakinetic.mtgfam 1933
+com.gh4a 8685
+com.ghostsq.commander 42742
+com.ghostsq.commander.samba 5020
+com.ghostsq.commander.sftp 6361
+com.gimranov.zandy.app 1245
+com.ginkel.hashit 1066
+com.github.alijc.cricketsalarm 731
+com.github.andlyticsproject 4674
+com.github.cetoolbox 266
+com.github.egonw.isotopes 1058
+com.github.grimpy.botifier 662
+com.github.mobile 4080
+com.github.nicolassmith.urlevaluator 417
+com.github.nutomic.controldlna 3959
+com.github.ruleant.getback_gps 1455
+com.github.wdkapps.fillup 814
+com.glTron 9875
+com.gladis.tictactoe 3396
+com.gluegadget.hndroid 3709
+com.gmail.altakey.effy 4481
+com.gmail.charleszq 834
+com.gokhanmoral.stweaks.app 2010
+com.googamaphone.typeandspeak 4434
+com.google.android.apps.authenticator2 3575
+com.google.android.apps.iosched 1512
+com.google.android.diskusage 17336
+com.google.android.maps.mytracks 583
+com.google.android.marvin.talkback 2146
+com.google.android.stardroid 16386
+com.google.code.apps2org 2544
+com.google.code.appsorganizer 8461
+com.google.marvin.shell 3923
+com.google.zxing.client.android 68240
+com.googlecode.android.wifi.tether 2786
 com.googlecode.androidcells 437
-com.googlecode.awsms 998
-com.googlecode.chartdroid 1257
-com.googlecode.droidwall 12688
-com.googlecode.gtalksms 3483
-com.googlecode.networklog 14257
-com.googlecode.openwnn.legacy 835
+com.googlecode.awsms 1494
+com.googlecode.chartdroid 1483
+com.googlecode.droidwall 14258
+com.googlecode.eyesfree.espeak 1769
+com.googlecode.gogodroid 671
+com.googlecode.gtalksms 4532
+com.googlecode.networklog 17688
+com.googlecode.openwnn.legacy 994
 com.googlecode.talkmyphone 835
-com.googlecode.tcime 517
-com.gpl.rpg.AndorsTrail 22683
+com.googlecode.tcime 666
+com.gpl.rpg.AndorsTrail 31623
 com.gpstether 106
-com.grapefruitopia.dashclock.k9 768
-com.gs.mobileprint 2456
-com.gueei.applocker 5401
-com.gulshansingh.hackerlivewallpaper 5182
-com.harasoft.relaunch 1205
-com.hectorone.multismssender 2084
-com.hermit.btreprap 841
-com.hexad.bluezime 2576
-com.hexad.bluezime.hidenabler 1001
-com.hobbyone.HashDroid 2301
-com.hughes.android.dictionary 7346
-com.hyperionics.fbreader.plugin.tts_plus 5446
-com.iazasoft.footguy 1723
-com.ichi2.anki 8998
-com.ideasfrombrain.search_based_launcher_v2 3247
-com.ihunda.android.binauralbeat 13017
-com.integralblue.callerid 4889
-com.intervigil.micdroid 2139
-com.irahul.worldclock 2419
-com.ivanvolosyuk.sharetobrowser 969
-com.jadn.cc 3627
-com.jakebasile.android.hearingsaver 1238
-com.java.SmokeReducer 1452
-com.jecelyin.editor 10571
-com.jeyries.quake2 6719
-com.jlyr 2305
-com.jotabout.screeninfo 2699
-com.jpkrause.c_feed 1525
-com.jwetherell.heart_rate_monitor 2949
-com.kai1973i 3768
-com.kibab.android.EncPassChanger 1623
-com.kirit.android.mintercept 7568
-com.kkinder.charmap 1758
-com.kkinder.sharelocation 126
-com.kmagic.solitaire 14246
-com.kostmo.wallpaper.spiral 3435
-com.kpz.pomodorotasks.activity 3576
-com.kvance.Nectroid 1627
-com.leafdigital.kanji.android 1409
-com.lecz.android.tiltmazes 6718
-com.leinardi.kitchentimer 5750
-com.liato.bankdroid 1975
-com.lukekorth.screennotifications 1419
-com.madgag.agit 3923
-com.manor.currentwidget 2831
-com.manuelmaly.hn 2639
-com.mareksebera.dilbert 2578
-com.mareksebera.simpledilbert 2866
-com.martinborjesson.o2xtouchlednotifications 1779
-com.matburt.mobileorg 5444
-com.maxfierke.sandwichroulette 1043
-com.mendhak.gpslogger 2880
-com.menny.android.anysoftkeyboard 17594
-com.midisheetmusic 2369
-com.miracleas.bitcoin_spinner 1480
-com.mkf.droidsat 4272
-com.mobilepearls.sokoban 7727
-com.mohammadag.beamfile 4524
-com.monead.games.android.sequence 1989
-com.morphoss.acal 29233
-com.mp3tunes.android.player 204
-com.mridang.cellinfo 992
-com.mridang.wifiinfo 1680
-com.myopicmobile.textwarrior.android 6766
-com.naholyr.android.horairessncf 1110
-com.namelessdev.mpdroid 6883
-com.nanoconverter.zlab 2098
-com.nauj27.android.colorpicker 1795
-com.nephoapp.anarxiv 1592
-com.netthreads.android.noiz2 2541
-com.newsblur 2339
-com.nexes.manager 8306
-com.nightshadelabs.anotherbrowser 2395
-com.nilhcem.frcndict 855
-com.nilhcem.hostseditor 2071
-com.nolanlawson.apptracker 2588
-com.nolanlawson.chordreader 2876
-com.nolanlawson.jnameconverter 1197
-com.nolanlawson.keepscore 2631
-com.nolanlawson.logcat 4922
-com.nononsenseapps.notepad 3197
-com.notriddle.budget 4834
-com.notriddle.null_launcer 1849
-com.omegavesko.holocounter 1253
-com.opendoorstudios.ds4droid 8330
+com.gracecode.android.presentation 135
+com.grapefruitopia.dashclock.k9 773
+com.gs.mobileprint 2936
+com.gueei.applocker 7486
+com.gulshansingh.hackerlivewallpaper 7150
+com.harasoft.relaunch 1707
+com.hectorone.multismssender 2641
+com.hermit.btreprap 1030
+com.hexad.bluezime 3220
+com.hexad.bluezime.hidenabler 1296
+com.hobbyone.HashDroid 3291
+com.htruong.inputmethod.latin 249
+com.hughes.android.dictionary 9535
+com.hyperionics.fbreader.plugin.tts_plus 6200
+com.iazasoft.footguy 2104
+com.ichi2.anki 14033
+com.ideasfrombrain.search_based_launcher_v2 4126
+com.ihunda.android.binauralbeat 15607
+com.integralblue.callerid 6166
+com.intervigil.micdroid 2937
+com.intrications.android.sharebrowser 458
+com.irahul.worldclock 3024
+com.ivanvolosyuk.sharetobrowser 1245
+com.jadn.cc 4142
+com.jakebasile.android.hearingsaver 1564
+com.java.SmokeReducer 1830
+com.jaygoel.virginminuteschecker 107
+com.jecelyin.editor 15181
+com.jeyries.quake2 8251
+com.jlyr 2935
+com.jmartin.temaki 442
+com.jonglen7.jugglinglab 865
+com.jotabout.screeninfo 3370
+com.jpkrause.c_feed 1529
+com.jwetherell.heart_rate_monitor 3823
+com.kaeruct.glxy 4216
+com.kai1973i 5664
+com.kibab.android.EncPassChanger 2213
+com.kirit.android.mintercept 9031
+com.kkinder.charmap 2237
+com.kkinder.sharelocation 127
+com.kmagic.solitaire 17444
+com.knirirr.beecount 40350
+com.kostmo.wallpaper.spiral 4032
+com.kpz.pomodorotasks.activity 4644
+com.kvance.Nectroid 2064
+com.kyakujin.android.tagnotepad 602
+com.leafdigital.kanji.android 1805
+com.lecz.android.tiltmazes 9629
+com.leinardi.kitchentimer 6640
+com.liato.bankdroid 2505
+com.lightbox.android.camera 1024
+com.linkomnia.android.Changjie 243
+com.littlebytesofpi.pylauncher 343
+com.lukekorth.screennotifications 1792
+com.madgag.agit 8402
+com.manor.currentwidget 3804
+com.manuelmaly.hn 4534
+com.mareksebera.dilbert 2589
+com.mareksebera.simpledilbert 4293
+com.martinborjesson.o2xtouchlednotifications 2375
+com.matburt.mobileorg 6279
+com.matoski.adbm 2790
+com.matteopacini.katana 79
+com.maxfierke.sandwichroulette 1308
+com.mehmetakiftutuncu.eshotroid 114
+com.mendhak.gpslogger 3592
+com.menny.android.anysoftkeyboard 24434
+com.midisheetmusic 3148
+com.miracleas.bitcoin_spinner 1941
+com.mirasmithy.epochlauncher 1497
+com.mkf.droidsat 5259
+com.mobilepearls.sokoban 9308
+com.mobiperf 377
+com.mod.android.widget.fbcw 333
+com.mohammadag.beamfile 5935
+com.monead.games.android.sequence 2747
+com.morphoss.acal 36135
+com.mp3tunes.android.player 207
+com.mridang.cellinfo 1473
+com.mridang.wifiinfo 2309
+com.mykola.lexinproject 119
+com.myopicmobile.textwarrior.android 8896
+com.naholyr.android.horairessncf 1377
+com.namelessdev.mpdroid 10174
+com.nanoconverter.zlab 2632
+com.nauj27.android.colorpicker 2578
+com.nephoapp.anarxiv 2756
+com.nesswit.galbijjimsearcher 599
+com.netthreads.android.noiz2 3149
+com.newsblur 3080
+com.nexes.manager 9552
+com.nightshadelabs.anotherbrowser 3264
+com.nilhcem.frcndict 1138
+com.nilhcem.hostseditor 2955
+com.niparasc.papanikolis 636
+com.nolanlawson.apptracker 3632
+com.nolanlawson.chordreader 3794
+com.nolanlawson.jnameconverter 1518
+com.nolanlawson.keepscore 4272
+com.nolanlawson.logcat 6508
+com.nononsenseapps.notepad 3239
+com.notriddle.budget 6874
+com.notriddle.null_launcer 2471
+com.omegavesko.holocounter 1631
+com.opendoorstudios.ds4droid 11348
+com.orphan.amplayer 1744
 com.owncloud 1267
-com.owncloud.android 36952
-com.palliser.nztides 665
-com.paranoid.ParanoidWallpapers 3391
+com.owncloud.android 57306
+com.palliser.nztides 904
+com.paranoid.ParanoidWallpapers 4409
 com.passwordmaker 122
-com.pilot51.voicenotify 1711
-com.pindroid 1712
-com.piwi.stickeroid 860
-com.plusonelabs.calendar 2551
-com.polipoid 1096
-com.politedroid 1153
-com.powerje.nyan 3760
-com.proch.practicehub 6095
-com.psrivastava.deviceframegenerator 1070
-com.purplefoto.pfdock 1587
-com.qsp.player 456
-com.qubling.sidekick 1397
-com.radioreddit.android 1281
-com.replica.replicaisland 9500
-com.rhiannonweb.android.migrainetracker 963
-com.rigid.birthdroid 2436
-com.ringdroid 6230
-com.rj.pixelesque 4479
-com.robert.maps 7734
-com.roguetemple.hydroid 2937
-com.roguetemple.hyperroid 3151
-com.roozen.SoundManager 1960
-com.roozen.SoundManagerv2 2469
-com.saibotd.bitbeaker 2160
-com.sam.hex 3050
-com.sandeel.bushidoblocks 2335
-com.scottmain.android.searchlight 8637
-com.seafile.seadroid 814
-com.seavenois.tetris 7846
-com.seawolfsanctuary.keepingtracks 735
-com.seb.SLWP 6201
-com.seb.SLWPmaps 2626
-com.serone.desktoplabel 2588
-com.showmehills 1090
-com.shurik.droidzebra 3659
-com.sigseg.android.worldmap 4289
-com.sinpo.xnfc 3012
-com.smerty.ham 1474
-com.smorgasbork.hotdeath 4785
-com.sputnik.wispr 1541
-com.stericson.permissions 4189
-com.sweetiepiggy.everylocale 1851
-com.tastycactus.timesheet 3337
-com.teamdc.stephendiniz.autoaway 1858
-com.teleca.jamendo 7996
-com.templaro.opsiz.aka 1680
-com.textuality.lifesaver2 4151
-com.threedlite.livePolys 1990
-com.threedlite.urforms 1403
-com.tmarki.comicmaker 2319
-com.tortuca.holoken 1923
-com.totsp.bookworm 2648
-com.totsp.crossword.shortyz 2347
-com.tum.yahtzee 111324
-com.tunes.viewer 2052
-com.ubergeek42.WeechatAndroid 1268
-com.ubuntuone.android.files 609
-com.umang.dashnotifier 401
-com.unitedcoders.android.gpodroid 1080
-com.uploadedlobster.PwdHash 2482
-com.uraroji.garage.android.mp3recvoice 1809
-com.valleytg.oasvn.android 1579
-com.veken0m.bitcoinium 3748
-com.vlille.checker 560
-com.voidcode.diasporawebclient 5492
-com.volosyukivan 5715
-com.vonglasow.michael.satstat 9097
-com.wanghaus.remembeer 810
-com.webworxshop.swallowcatcher 1560
-com.write.Quill 3765
-com.xabber.androiddev 10051
-com.xatik.app.droiddraw.client 2471
-com.xlythe.minecraftclock 1458
-com.yubico.yubioath 334
-com.yubico.yubitotp 605
-com.zachrattner.pockettalk 1317
-com.zapta.apps.maniana 5695
-com.zaren 1722
-com.zegoggles.smssync 3171
-com.zoffcc.applications.aagtl 2160
-cri.sanity 4847
-cx.hell.android.pdfview 24159
-cxa.lineswallpaper 3431
-cz.hejl.chesswalk 10873
-cz.romario.opensudoku 9177
-damo.three.ie 388
-dasher.android 2020
-de.aditu.selfoss 686
-de.antonfluegge.android.yubnubwidgetadfree 1021
-de.antonwolf.agendawidget 3466
-de.arnowelzel.android.periodical 1896
-de.azapps.mirakelandroid 3639
-de.blau.android 3085
-de.blinkt.openvpn 644
-de.cketti.dashclock.k9 984
-de.danielweisser.android.ldapsync 1672
-de.danoeh.antennapod 12107
-de.delusions.measure 3443
-de.duenndns.gmdice 3323
-de.fmaul.android.cmis 1018
-de.freewarepoint.whohasmystuff 2697
-de.geeksfactory.opacclient 1425
-de.grobox.blitzmail 1462
-de.grobox.liberario 1441
-de.homac.Mirrored 1772
-de.jdsoft.law 2925
+com.pilot51.voicenotify 2474
+com.pindroid 2154
+com.piratebayfree 509
+com.piwi.stickeroid 1108
+com.plusonelabs.calendar 5148
+com.polipoid 1497
+com.politedroid 1559
+com.powerje.nyan 4645
+com.proch.practicehub 7513
+com.psrivastava.deviceframegenerator 1074
+com.purplefoto.pfdock 2056
+com.qsp.player 651
+com.qubling.sidekick 1811
+com.radioreddit.android 1916
+com.reicast.emulator 891
+com.replica.replicaisland 11471
+com.rhiannonweb.android.migrainetracker 1235
+com.rigid.birthdroid 3643
+com.ringdroid 7463
+com.rj.pixelesque 5304
+com.robert.maps 9568
+com.roguetemple.hydroid 4271
+com.roguetemple.hyperroid 4510
+com.roozen.SoundManager 1965
+com.roozen.SoundManagerv2 3229
+com.ruesga.android.wallpapers.photophase 296
+com.saibotd.bitbeaker 2714
+com.sam.hex 3801
+com.sandeel.bushidoblocks 3375
+com.sapos_aplastados.game.clash_of_balls 871
+com.scar45.aokp.co.webviewer 160990
+com.scottmain.android.searchlight 11395
+com.seafile.seadroid 1070
+com.seafile.seadroid2 296
+com.seavenois.tetris 9490
+com.seawolfsanctuary.keepingtracks 1031
+com.seb.SLWP 8037
+com.seb.SLWPmaps 3508
+com.serone.desktoplabel 2952
+com.sgr_b2.compass 2959
+com.shahul3d.indiasatelliteweather 294
+com.showmehills 1470
+com.shurik.droidzebra 4715
+com.sigseg.android.worldmap 5806
+com.silentlexx.instead 1356
+com.sinpo.xnfc 4044
+com.sismics.reader 297
+com.sli.ohmcalc 330
+com.smerty.ham 1945
+com.smorgasbork.hotdeath 5828
+com.spazedog.mounts2sd 1405
+com.sputnik.wispr 1980
+com.stericson.permissions 4192
+com.studio332.flickit 1308
+com.sweetiepiggy.everylocale 2412
+com.taiste.lainari_en 113
+com.tastycactus.timesheet 3952
+com.teamdc.stephendiniz.autoaway 2663
+com.teleca.jamendo 9196
+com.templaro.opsiz.aka 2789
+com.ten15.diyfish 671
+com.textuality.lifesaver2 5317
+com.th.XenonWallpapers 351
+com.threedlite.livePolys 2467
+com.threedlite.urforms 1804
+com.threedlite.userhash.location 175
+com.tkjelectronics.balanduino 98
+com.tmarki.comicmaker 3004
+com.tobykurien.google_news 6666
+com.tortuca.holoken 2577
+com.totsp.bookworm 3114
+com.totsp.crossword.shortyz 3133
+com.traffar.game_of_life 76483
+com.tum.yahtzee 112170
+com.tunes.viewer 2710
+com.u17od.upm 478
+com.ubergeek42.WeechatAndroid 1791
+com.ubuntuone.android.files 1119
+com.ultramegatech.ey 1700
+com.umang.dashnotifier 1573
+com.unitedcoders.android.gpodroid 1090
+com.uploadedlobster.PwdHash 3269
+com.uraroji.garage.android.mp3recvoice 2720
+com.valleytg.oasvn.android 2011
+com.veken0m.bitcoinium 6669
+com.vlille.checker 786
+com.vmihalachi.turboeditor 891
+com.voidcode.diasporawebclient 6548
+com.volosyukivan 6603
+com.vonglasow.michael.satstat 15465
+com.vwp.owmap 1330
+com.wanghaus.remembeer 1019
+com.webworxshop.swallowcatcher 1562
+com.weicheng.taipeiyoubikeoffline 80
+com.wentam.defcol 36564
+com.willhauck.linconnectclient 440
+com.write.Quill 4907
+com.xabber.androiddev 14312
+com.xatik.app.droiddraw.client 3119
+com.xlythe.minecraftclock 1944
+com.yubico.yubiclip 174
+com.yubico.yubioath 698
+com.yubico.yubitotp 804
+com.zachrattner.pockettalk 1633
+com.zagayevskiy.pacman 205276
+com.zapta.apps.maniana 6674
+com.zaren 2274
+com.zegoggles.smssync 4534
+com.zoffcc.applications.aagtl 3446
+cri.sanity 5852
+cx.hell.android.pdfview 30029
+cxa.lineswallpaper 4452
+cz.hejl.chesswalk 14491
+cz.romario.opensudoku 11299
+damo.three.ie 550
+dasher.android 2639
+de.aditu.selfoss 688
+de.antonfluegge.android.yubnubwidgetadfree 1327
+de.antonwolf.agendawidget 4899
+de.arnowelzel.android.periodical 2511
+de.azapps.mirakel.dashclock 617
+de.azapps.mirakelandroid 9817
+de.blau.android 3687
+de.blinkt.openvpn 7530
+de.cketti.dashclock.k9 2540
+de.cwde.freeshisen 2087
+de.danielweisser.android.ldapsync 2014
+de.danoeh.antennapod 17571
+de.delusions.measure 4115
+de.duenndns.gmdice 4010
+de.enaikoon.android.keypadmapper3 739
+de.fmaul.android.cmis 1291
+de.freewarepoint.whohasmystuff 3327
+de.geeksfactory.opacclient 1750
+de.grobox.blitzmail 2209
+de.grobox.liberario 2896
+de.hechler.andfish 660
+de.homac.Mirrored 2677
+de.jdsoft.law 3680
 de.joergjahnke.c64.android 35
-de.jurihock.voicesmith 6422
-de.kromonos.android.rpcoiner 26
-de.kugihan.dictionaryformids.hmi_android 2264
-de.luhmer.owncloudnewsreader 3871
-de.mangelow.network 1882
-de.mbutscher.wikiandpad.alphabeta 2192
-de.onyxbits.listmyapps 3940
-de.onyxbits.pocketbandit 2976
-de.onyxbits.remotekeyboard 2214
-de.onyxbits.sensorreadout 7424
-de.schaeuffelhut.android.openvpn 4504
-de.schildbach.wallet 4700
-de.schildbach.wallet_test 1104
-de.shandschuh.slightbackup 6376
-de.shandschuh.sparserss 12095
-de.skubware.opentraining 2753
-de.stefan_oltmann.falling_blocks 5689
-de.stefan_oltmann.kaesekaestchen 2057
-de.tui.itlogger 763
-de.tum.in.tumcampus 454
-de.ub0r.android.adBlock 7369
-de.ub0r.android.callmeter 3475
-de.ub0r.android.clipboardbeam 451
-de.ub0r.android.otpdroid 1088
-de.ub0r.android.smsdroid 5306
-de.ub0r.android.websms 2807
-de.ub0r.android.websms.connector.gmx 955
-de.ub0r.android.websms.connector.smspilotru 709
-de.uni_potsdam.hpi.openmensa 519
-de.wikilab.android.friendica01 1493
-de.yaacc 2582
-dentex.youtube.downloader 22450
-dev.drsoran.moloko 1959
-dev.ukanth.ufirewall 23796
-dk.andsen.asqlitemanager 7381
-dk.jens.backup 4209
-dk.mide.fas.cmnightlies 4083
-dk.nindroid.rss 1579
-edu.killerud.kitchentimer 3620
-edu.nyu.cs.omnidroid.app 3854
-edu.rit.poe.atomix 6146
-edu.sfsu.cs.orange.ocr 3537
-ee.smkv.calc.loan 1260
-es.cesar.quitesleep 2442
-es.prodevelop.gvsig.mini 2099
-eu.domob.anacam 6651
-eu.domob.angulo 5187
-eu.domob.bjtrainer 2904
-eu.e43.impeller 3348
-eu.flatworld.android.slider 2706
-eu.hydrologis.geopaparazzi 1941
-eu.lavarde.pmtd 2081
-eu.lighthouselabs.obd.reader 1547
-eu.prismsw.lampshade 1125
-eu.siebeck.sipswitch 1372
-eu.vranckaert.worktime 2061
-faenza.adw.theme 3858
-fi.harism.wallpaper.flier 2211
-fi.harism.wallpaper.flowers 1428
-fi.harism.wallpaper.yinyang 2813
-fi.mikuz.boarder 1559
-fm.libre.droid 3446
-fr.bellev.stdatmosphere 879
-fr.gaulupeau.apps.Poche 1360
-fr.keuse.rightsalert 2957
-fr.miximum.napply 1678
-fr.seeks 1589
-fr.strasweb.browserquest 3669
-fr.strasweb.campus 354
-fr.xgouchet.texteditor 4404
-fr.ybo.transportsbordeaux 452
-fr.ybo.transportsrennes 399
-genius.mohammad.floating.stickies 2345
-github.daneren2005.dsub 2487
-goo.TeaTimer 3250
-gr.ndre.scuttloid 443
-home.jmstudios.calc 413
-hsware.HSTempo 1216
-hu.vsza.adsdroid 4812
-i4nc4mp.myLock 1946
-in.shick.diode 6109
-in.shick.lockpatterngenerator 2539
-info.guardianproject.browser 15696
-info.guardianproject.cacert 3739
-info.guardianproject.lildebi 13836
-info.guardianproject.otr.app.im 14310
-info.lamatricexiste.network 17664
-info.staticfree.SuperGenPass 1148
-info.staticfree.android.robotfindskitten 3254
-info.staticfree.android.twentyfourhour 8769
-info.staticfree.android.units 10277
+de.jurihock.voicesmith 9614
+de.koelle.christian.trickytripper 213
+de.kromonos.android.rpcoiner 27
+de.kugihan.dictionaryformids.hmi_android 3008
+de.laxu.apps.nachtlagerdownloader 85
+de.luhmer.owncloudnewsreader 6543
+de.mangelow.network 2474
+de.markusfisch.android.wavelines 921
+de.mbutscher.wikiandpad.alphabeta 2784
+de.onyxbits.drudgery 527
+de.onyxbits.listmyapps 5392
+de.onyxbits.pocketbandit 4100
+de.onyxbits.remotekeyboard 2928
+de.onyxbits.sensorreadout 10834
+de.onyxbits.textfiction 338
+de.qspool.clementineremote 487
+de.schaeuffelhut.android.openvpn 6053
+de.schildbach.wallet 7997
+de.schildbach.wallet_test 1564
+de.shandschuh.slightbackup 7619
+de.shandschuh.sparserss 13712
+de.skubware.opentraining 4104
+de.srlabs.gsmmap 708
+de.stefan_oltmann.falling_blocks 7157
+de.stefan_oltmann.kaesekaestchen 2791
+de.syss.MifareClassicTool 930
+de.tui.itlogger 952
+de.tum.in.tumcampus 630
+de.ub0r.android.adBlock 7393
+de.ub0r.android.callmeter 4890
+de.ub0r.android.clipboardbeam 664
+de.ub0r.android.otpdroid 1377
+de.ub0r.android.smsdroid 7552
+de.ub0r.android.websms 3860
+de.ub0r.android.websms.connector.gmx 1267
+de.ub0r.android.websms.connector.smspilotru 931
+de.uni_potsdam.hpi.openmensa 872
+de.wikilab.android.friendica01 1974
+de.yaacc 6070
+dentex.youtube.downloader 26396
+dev.drsoran.moloko 2452
+dev.ukanth.ufirewall 36135
+dk.andsen.asqlitemanager 8812
+dk.jens.backup 7892
+dk.mide.fas.cmnightlies 5390
+dk.nindroid.rss 2279
+edu.killerud.kitchentimer 4811
+edu.nyu.cs.omnidroid.app 4446
+edu.rit.poe.atomix 7308
+edu.sfsu.cs.orange.ocr 4709
+ee.smkv.calc.loan 1603
+es.cesar.quitesleep 2929
+es.prodevelop.gvsig.mini 2105
+eu.domob.anacam 10253
+eu.domob.angulo 9183
+eu.domob.bjtrainer 3787
+eu.e43.impeller 4344
+eu.flatworld.android.slider 3484
+eu.hydrologis.geopaparazzi 2348
+eu.johncasson.meerkatchallenge 1280
+eu.lavarde.pmtd 3375
+eu.lighthouselabs.obd.reader 2185
+eu.prismsw.lampshade 1450
+eu.siebeck.sipswitch 1834
+eu.vranckaert.worktime 2820
+faenza.adw.theme 4986
+fi.harism.wallpaper.flier 2770
+fi.harism.wallpaper.flowers 1781
+fi.harism.wallpaper.yinyang 3506
+fi.mikuz.boarder 1820
+fi.testbed2 223
+fm.libre.droid 4062
+fr.bellev.stdatmosphere 1070
+fr.gaulupeau.apps.Poche 2187
+fr.keuse.rightsalert 3595
+fr.miximum.napply 2104
+fr.seeks 1870
+fr.simon.marquis.preferencesmanager 3346
+fr.simon.marquis.secretcodes 10453
+fr.strasweb.asso 182
+fr.strasweb.browserquest 5201
+fr.strasweb.campus 454
+fr.xgouchet.texteditor 5884
+fr.ybo.transportsbordeaux 701
+fr.ybo.transportsrennes 724
+free.yhc.netmbuddy 1175
+genius.mohammad.floating.stickies 3472
+github.daneren2005.dsub 3871
+goo.TeaTimer 3733
+gr.ndre.scuttloid 593
+gr.tsagi.jekyllforandroid 176
+headrevision.BehatReporter 82
+home.jmstudios.calc 3727
+hsware.HSTempo 1592
+hu.vsza.adsdroid 8314
+i4nc4mp.myLock 2432
+in.ac.dtu.subtlenews 228
+in.shick.diode 7609
+in.shick.lockpatterngenerator 3514
+info.guardianproject.browser 20250
+info.guardianproject.cacert 4447
+info.guardianproject.gpg 1802
+info.guardianproject.lildebi 16734
+info.guardianproject.notepadbot 1157
+info.guardianproject.otr.app.im 17536
+info.guardianproject.pixelknot 138709
+info.lamatricexiste.network 21014
+info.staticfree.SuperGenPass 1513
+info.staticfree.android.robotfindskitten 4131
+info.staticfree.android.twentyfourhour 12347
+info.staticfree.android.units 12026
 info.toyonos.hfr4droid 37
+io.github.sanbeg.flashlight 994
 it.devapp.android 10
-it.ecosw.dudo 1142
-it.gmariotti.android.apps.dashclock.extensions.battery 1171
-it.iiizio.epubator 4008
-it.sasabz.android.sasabus 569
-it.sineo.android.noFrillsCPUClassic 5170
-ivl.android.moneybalance 1355
-jackpal.androidterm 25308
-jackpal.droidexaminer 2181
-jp.co.kayo.android.localplayer 10885
-jp.co.kayo.android.localplayer.ds.ampache 2404
-jp.co.kayo.android.localplayer.ds.podcast 1817
-jp.co.omronsoft.openwnn 1077
-jp.co.qsdn.android.jinbei3d 3325
-jp.gr.java_conf.hatalab.mnv 1894
-jp.ksksue.app.terminal 1174
-jp.sawada.np2android 1747
-jp.sblo.pandora.aGrep 2225
-jp.sfjp.webglmol.NDKmol 2250
-jupiter.broadcasting.live.tv 1855
-kaljurand_at_gmail_dot_com.diktofon 3835
-kdk.android.simplydo 4649
-kr.hybdms.sidepanel 4792
-li.klass.fhem 2078
-mancioboxblog.altervista.it.volumecontrol 1823
-me.guillaumin.android.osmtracker 11916
-me.kuehle.carreport 2769
-me.malladi.dashcricket 548
+it.ecosw.dudo 1808
+it.gmariotti.android.apps.dashclock.extensions.battery 1843
+it.iiizio.epubator 5014
+it.mn.salvi.linuxDayOSM 137
+it.sasabz.android.sasabus 731
+it.sineo.android.noFrillsCPUClassic 6982
+ivl.android.moneybalance 1784
+jackpal.androidterm 34614
+jackpal.droidexaminer 3203
+jp.co.kayo.android.localplayer 14336
+jp.co.kayo.android.localplayer.ds.ampache 3229
+jp.co.kayo.android.localplayer.ds.podcast 2372
+jp.co.omronsoft.openwnn 1258
+jp.co.qsdn.android.jinbei3d 4165
+jp.gr.java_conf.hatalab.mnv 2547
+jp.ksksue.app.terminal 2488
+jp.sawada.np2android 2494
+jp.sblo.pandora.aGrep 4087
+jp.sfjp.webglmol.NDKmol 2819
+jp.softstudio.DriversLicenseReader 83
+jpf.android.diary 1483
+jupiter.broadcasting.live.tv 2382
+kaljurand_at_gmail_dot_com.diktofon 4995
+kdk.android.simplydo 5643
+kr.hybdms.sidepanel 6130
+kr.softgear.multiping 359
+li.klass.fhem 5649
+mancioboxblog.altervista.it.volumecontrol 2364
+me.guillaumin.android.osmtracker 14044
+me.kuehle.carreport 3405
+me.malladi.dashcricket 810
 me.shkschneider.dropbearserver2 109
-mixedbit.speechtrainer 3928
-mobi.cyann.nstools 860
-mobi.omegacentauri.PerApp 2617
-mobi.omegacentauri.SendReduced 2224
-mohammad.adib.roundr 4487
-name.bagi.levente.pedometer 6135
-name.livitski.games.puzzle.android 400
-net.aangle.rvclock 1290
-net.androgames.level 11453
-net.androidcomics.acv 2470
-net.anzix.osm.upload 625
-net.asceai.meritous 3894
-net.avs234 11967
-net.bible.android.activity 5851
-net.bytten.xkcdviewer 8348
-net.cactii.mathdoku 5015
-net.chilon.matt.teacup 1362
-net.codechunk.speedofsound 1069
-net.cyclestreets 946
-net.czlee.debatekeeper 662
-net.dahanne.android.regalandroid 1710
-net.dahanne.banq.notifications 320
-net.everythingandroid.smspopup 2505
-net.fercanet.LNM 7940
-net.fred.feedex 12219
-net.gaast.giggity 1805
-net.georgewhiteside.android.abstractart 5142
-net.gorry.aicia 2597
-net.gorry.android.input.nicownng 1090
-net.healeys.lexic 2406
-net.iowaline.dotdash 3327
-net.jaqpot.netcounter 4911
-net.jjc1138.android.scrobbler 752
-net.kervala.comicsreader 4683
-net.logomancy.diedroid 3450
-net.luniks.android.inetify 624
-net.mafro.android.wakeonlan 5849
-net.micode.compass 13799
-net.micode.fileexplorer 8228
-net.micode.soundrecorder 3862
-net.momodalo.app.vimtouch 7068
-net.nightwhistler.pageturner 3777
-net.nurik.roman.dashclock 4251
-net.oschina.app 639
+mixedbit.speechtrainer 4569
+mobi.cyann.nstools 1081
+mobi.omegacentauri.PerApp 3352
+mobi.omegacentauri.SendReduced 2828
+mohammad.adib.roundr 5333
+monakhv.android.samlib 181
+name.bagi.levente.pedometer 7135
+name.boyle.chris.sgtpuzzles 2718
+name.juodumas.ext_kbd_lithuanian 53
+name.livitski.games.puzzle.android 1728
+name.soulayrol.rhaa.sholi 1265
+nerd.tuxmobil.fahrplan.congress 2632
+net.aangle.rvclock 1827
+net.androgames.level 13483
+net.androidcomics.acv 4265
+net.anzix.osm.upload 883
+net.asceai.meritous 4895
+net.avs234 17374
+net.bible.android.activity 9349
+net.bluetoothviewer 754
+net.bytten.xkcdviewer 9665
+net.cactii.mathdoku 5940
+net.chilon.matt.teacup 1750
+net.codechunk.speedofsound 1433
+net.cyclestreets 1199
+net.czlee.debatekeeper 928
+net.dahanne.android.regalandroid 2052
+net.dahanne.banq.notifications 457
+net.debian.debiandroid 569
+net.everythingandroid.smspopup 3137
+net.fercanet.LNM 9517
+net.fred.feedex 20102
+net.gaast.giggity 2196
+net.georgewhiteside.android.abstractart 7145
+net.gorry.aicia 4310
+net.gorry.android.input.nicownng 1396
+net.healeys.lexic 3024
+net.i2p.android.router 112063
+net.imatruck.betterweather 619
+net.iowaline.dotdash 3949
+net.jaqpot.netcounter 5515
+net.jjc1138.android.scrobbler 994
+net.kervala.comicsreader 5690
+net.lardcave.keepassnfc 416
+net.logomancy.dashquotes.civ5 277
+net.logomancy.diedroid 4473
+net.luniks.android.inetify 1026
+net.mafro.android.wakeonlan 6955
+net.majorkernelpanic.spydroid 1543
+net.micode.compass 16291
+net.micode.fileexplorer 10373
+net.micode.soundrecorder 5022
+net.momodalo.app.vimtouch 9160
+net.nightwhistler.pageturner 5096
+net.nurik.roman.dashclock 6376
+net.oschina.app 825
 net.osmand 3100
-net.osmand.plus 46840
-net.pierrox.mcompass 6890
-net.pmarks.chromadoze 3799
-net.progval.android.andquote 1471
-net.rocrail.androc 6328
-net.sf.andbatdog.batterydog 5083
-net.sf.andhsli.hotspotlogin 3038
-net.sourceforge.andsys 4334
-net.sourceforge.servestream 6878
-net.sourceforge.subsonic.androidapp 1284
-net.status.client.mobile 1149
-net.sylvek.sharemyposition 2990
-net.szym.barnacle 6459
-net.tapi.handynotes 9527
-net.tedstein.AndroSS 9261
-net.tevp.postcode 1107
-net.thauvin.erik.android.noussd 4747
-net.vivekiyer.GAL 1949
-net.wigle.wigleandroid 6192
-net.xenotropic.quizznworldcap 1120
-nitezh.ministock 990
-nl.sogeti.android.gpstracker 3102
-nl.ttys0.simplec25k 1650
-no.rkkc.bysykkel 609
-nu.firetech.android.pactrack 565
-orbitlivewallpaperfree.puzzleduck.com 3592
+net.osmand.plus 59089
+net.pejici.summation 158
+net.phunehehe.foocam 204642
+net.pierrox.mcompass 8008
+net.pmarks.chromadoze 5368
+net.progval.android.andquote 3586
+net.rocrail.androc 9682
+net.sf.andbatdog.batterydog 5707
+net.sf.andhsli.hotspotlogin 3827
+net.sf.times 191
+net.somethingdreadful.MAL 269
+net.sourceforge.andsys 7285
+net.sourceforge.servestream 8564
+net.sourceforge.subsonic.androidapp 1882
+net.sourceforge.wifiremoteplay 1784
+net.status.client.mobile 1150
+net.sylvek.sharemyposition 3526
+net.szym.barnacle 8212
+net.tapi.handynotes 10828
+net.tedstein.AndroSS 12710
+net.tevp.postcode 1352
+net.thauvin.erik.android.noussd 5860
+net.vivekiyer.GAL 2481
+net.wigle.wigleandroid 7987
+net.xenotropic.quizznworldcap 1587
+nf.frex.android 1583
+nitezh.ministock 1649
+nl.frankkie.bronylivewallpaper 323
+nl.mpcjanssen.simpletask 4891
+nl.sogeti.android.gpstracker 3662
+nl.ttys0.simplec25k 2088
+no.rkkc.bysykkel 789
+nu.firetech.android.pactrack 668
+nz.gen.geek_central.ObjViewer 263
+orbitlivewallpaperfree.puzzleduck.com 4379
 org.ab.x48 171
 org.abrantix.rockon.rockonnggl 1327
-org.adaway 746245
-org.adblockplus.android 40213
-org.addhen.smssync 1004
-org.adw.launcher 11966
-org.aja.flightmode 921
-org.ale.openwatch 1841
-org.ale.scanner.zotero 1080
-org.ametro 6347
-org.andglkmod.hunkypunk 1859
+org.adaway 1131716
+org.adblockplus.android 54934
+org.addhen.smssync 1383
+org.adw.launcher 15605
+org.aja.flightmode 1316
+org.ale.openwatch 2342
+org.ale.scanner.zotero 1342
+org.ametro 9230
+org.andglkmod.hunkypunk 2388
 org.andnav.osm 3166
-org.androidappdev.batterywidget 3678
-org.androidappdev.wifiwidget 2301
-org.androidsoft.app.permission 3357
-org.androidsoft.coloring 5371
-org.androidsoft.games.memory.kids 6315
-org.androidsoft.games.slowit 1605
-org.andstatus.app 4114
-org.ardour 1301
-org.balau.fakedawn 3385
-org.bc_bd.mrwhite 5128
-org.beide.bomber 9185
-org.beide.droidgain 1108
-org.billthefarmer.accordion 2093
-org.billthefarmer.melodeon 935
-org.billthefarmer.tuner 1812
-org.birthdayadapter 6882
-org.blockinger.game 10936
-org.bombusmod 954
+org.androidappdev.batterywidget 4703
+org.androidappdev.wifiwidget 3026
+org.androidsoft.app.permission 4379
+org.androidsoft.coloring 7510
+org.androidsoft.games.memory.kids 7982
+org.androidsoft.games.slowit 3100
+org.andstatus.app 9335
+org.ardour 2129
+org.balau.fakedawn 4330
+org.bc_bd.mrwhite 6264
+org.beide.bomber 11924
+org.beide.droidgain 1566
+org.billthefarmer.accordion 4421
+org.billthefarmer.melodeon 1355
+org.billthefarmer.tuner 2909
+org.birthdayadapter 8493
+org.blockinger.game 13932
+org.bombusmod 1314
 org.bostonandroid.umbrellatoday 287
-org.brandroid.openmanager 12584
-org.broeuschmeul.android.gps.bluetooth.provider 2109
-org.connectbot 19137
-org.coolreader 20951
-org.crocodile.sbautologin 1685
-org.cry.otp 1392
-org.curiouscreature.android.shelves 795
-org.damazio.notifier 1995
-org.diygenomics.pg 743
-org.dmfs.tasks 674
-org.dnaq.dialer2 4985
-org.dpadgett.timer 4063
-org.droidparts.battery_widget 2903
-org.droidseries 4834
-org.dsandler.apps.markers 5056
-org.dynalogin.android 759
-org.dyndns.fules.ck 2319
-org.dyndns.ipignoli.petronius 1072
-org.eehouse.android.xw4 6196
-org.epstudios.epmobile 3328
-org.epstudios.morbidmeter 2748
-org.example.pushupbuddy 2217
-org.fastergps 21994
-org.fdroid.dashclock.k9 1157
-org.fdroid.fdroid 3010787
-org.fdroid.k9 16476
-org.fdroid.superuser 10073
+org.brandroid.openmanager 16022
+org.broeuschmeul.android.gps.bluetooth.provider 2778
+org.chrisbailey.todo 204724
+org.congresointeractivo.elegilegi 346
+org.connectbot 24227
+org.coolreader 24723
+org.cprados.wificellmanager 699
+org.crocodile.sbautologin 2134
+org.cry.otp 1738
+org.curiouscreature.android.shelves 801
+org.damazio.notifier 2272
+org.dgtale.icsimport 2656
+org.diygenomics.pg 928
+org.dmfs.tasks 1225
+org.dnaq.dialer2 6233
+org.dolphinemu.dolphinemu 204658
+org.dpadgett.timer 5947
+org.droidparts.battery_widget 3675
+org.droidseries 5652
+org.droidupnp 1979
+org.dsandler.apps.markers 8953
+org.durka.hallmonitor 73026
+org.dynalogin.android 986
+org.dyndns.fules.ck 2975
+org.dyndns.ipignoli.petronius 1320
+org.dyndns.sven_ola.debian_kit 2061
+org.eehouse.android.xw4 7370
+org.epstudios.epmobile 4120
+org.epstudios.morbidmeter 3441
+org.evilsoft.pathfinder.reference 232
+org.example.pushupbuddy 2541
+org.fastergps 29172
+org.fdroid.dashclock.k9 1163
+org.fdroid.fdroid 3850448
+org.fdroid.k9 16888
+org.fdroid.superuser 15050
 org.fdroid.taskstrid 25
+org.fedorahosted.freeotp 73326
 org.fosdem 748
-org.fox.ttrss 9678
-org.gc.networktester 3668
-org.gege.caldavsyncadapter 8118
-org.geometerplus.fbreader.plugin.local_opds_scanner 829
-org.geometerplus.fbreader.plugin.tts 1793
-org.geometerplus.zlibrary.ui.android 25151
-org.github.OxygenGuide 2095
-org.gitorious.jamesjrh.isokeys 4422
-org.gmote.client.android 4065
-org.gnucash.android 6624
-org.helllabs.android.xmp 2897
-org.hermit.audalyzer 4068
-org.hermit.netscramble 2506
-org.hermit.tricorder 12776
-org.herrlado.ask.languagepack.lithuanian 526
-org.herrlado.geofonts 527
-org.ironrabbit 237
-org.ironrabbit.bhoboard 484
-org.jamienicol.episodes 1794
-org.jessies.dalvikexplorer 5452
-org.jessies.mathdroid 10963
-org.jf.Penroser 2304
-org.jfedor.frozenbubble 32624
-org.jfedor.nxtremotecontrol 780
-org.jmoyer.NotificationPlus 1908
+org.fox.ttrss 9700
+org.gc.networktester 4718
+org.gege.caldavsyncadapter 13373
+org.geometerplus.fbreader.plugin.local_opds_scanner 1235
+org.geometerplus.fbreader.plugin.tts 2194
+org.geometerplus.zlibrary.ui.android 28046
+org.github.OxygenGuide 2616
+org.gitorious.jamesjrh.isokeys 5753
+org.gmote.client.android 5227
+org.gnucash.android 8422
+org.hanenoshino.onscripter 203408
+org.helllabs.android.xmp 3365
+org.hermit.audalyzer 4077
+org.hermit.netscramble 2518
+org.hermit.tricorder 14938
+org.herrlado.ask.languagepack.lithuanian 1356
+org.herrlado.geofonts 693
+org.hystudio.android.dosbox 2083
+org.ironrabbit 352
+org.ironrabbit.bhoboard 662
+org.jamienicol.episodes 2851
+org.jessies.dalvikexplorer 8363
+org.jessies.mathdroid 12487
+org.jf.Penroser 2813
+org.jfedor.frozenbubble 41521
+org.jfedor.nxtremotecontrol 1014
+org.jmoyer.NotificationPlus 2217
 org.johanhil.flygtider 189
-org.jsharkey.sky 4918
-org.jtb.alogcat 9400
-org.jtb.droidlife 8042
-org.jtb.httpmon 3091
-org.katsarov.dofcalc 2463
-org.kde.necessitas.ministro 1346
-org.kontalk 2953
-org.kost.externalip 7829
-org.kreed.vanilla 8138
-org.kwaak3 1183
-org.liberty.android.fantastischmemo 3210
-org.ligi.fast 4257
-org.linphone 9400
-org.lumicall.android 5051
-org.macno.puma 2056
-org.madore.android.unicodeMap 1629
+org.jsharkey.sky 5938
+org.jtb.alogcat 13050
+org.jtb.droidlife 9540
+org.jtb.httpmon 3667
+org.katsarov.dofcalc 3212
+org.kde.kdeconnect_tp 172654
+org.kde.necessitas.ministro 1854
+org.kontalk 4040
+org.kost.externalip 9160
+org.kreed.vanilla 8873
+org.kwaak3 1851
+org.liberty.android.fantastischmemo 6047
+org.ligi.fast 5519
+org.linphone 12157
+org.logicallycreative.movingpolygons 611
+org.lumicall.android 6325
+org.macno.puma 2941
+org.madore.android.unicodeMap 1921
 org.mailboxer.saymyname 34
-org.marcus905.wifi.ace 6643
-org.mariotaku.twidere 6594
-org.mariotaku.twidere.extension.twitlonger 809
-org.me.tvhguide 1088
-org.mixare 3713
-org.moparisthebest.appbak 3195
-org.mosspaper 2560
-org.mozilla.firefox 82704
-org.mozilla.firefox_beta 5676
-org.mult.daap 4095
-org.mumod.android 465
-org.musicbrainz.picard.barcodescanner 641
-org.mustard.android 5499
-org.mythdroid 2344
-org.nathan.jf.build.prop.editor 3592
-org.navitproject.navit 6219
-org.ncrmnt.nettts 610
-org.nerdcircus.android.klaxon 963
-org.nick.wwwjdic 383
-org.npr.android.news 1358
-org.ntpsync 9380
-org.odk.collect.android 1427
-org.openbmap 3681
-org.opengpx 1252
-org.openintents.about 832
-org.openintents.filemanager 18731
+org.marcus905.wifi.ace 7682
+org.mariotaku.twidere 12148
+org.mariotaku.twidere.extension.twitlonger 1089
+org.me.tvhguide 1476
+org.mixare 4302
+org.montrealtransit.android 131
+org.montrealtransit.android.schedule.stmbus 68
+org.moparisthebest.appbak 3197
+org.mosspaper 3622
+org.mozilla.firefox 118543
+org.mozilla.firefox_beta 5697
+org.mozilla.mozstumbler 563
+org.mult.daap 4936
+org.mumod.android 628
+org.musicbrainz.picard.barcodescanner 870
+org.mustard.android 5892
+org.mythdroid 2806
+org.n52.sosmobileclient 405
+org.nathan.jf.build.prop.editor 4761
+org.navitproject.navit 11152
+org.ncrmnt.nettts 816
+org.nerdcircus.android.klaxon 1159
+org.nick.wwwjdic 600
+org.npr.android.news 1902
+org.ntpsync 11553
+org.odk.collect.android 1760
+org.okfn.pod 1053
+org.openbmap 5000
+org.opengpx 1511
+org.openintents.about 1077
+org.openintents.filemanager 23762
 org.openintents.newsreader 5
-org.openlp.android 313
+org.openlp.android 641
 org.opensatnav 5410
-org.opensatnav.android 919
-org.passwordmaker.android 2086
-org.paulmach.textedit 8457
-org.penghuang.tools.rotationlock 5055
-org.peterbaldwin.client.android.tinyurl 843
-org.peterbaldwin.client.android.vlcremote 3843
-org.petero.droidfish 4514
-org.piwik.mobile 928
-org.pocketworkstation.pckeyboard 20352
-org.ppsspp.ppsspp 84010
-org.primftpd 2182
-org.projectmaxs.main 718
-org.projectmaxs.module.bluetooth 265
-org.projectmaxs.module.bluetoothadmin 192
-org.projectmaxs.module.clipboard 237
-org.projectmaxs.module.contactsread 306
-org.projectmaxs.module.fileread 195
-org.projectmaxs.module.filewrite 220
-org.projectmaxs.module.phonestateread 228
-org.projectmaxs.module.ringermode 174
-org.projectmaxs.module.smsnotify 216
-org.projectmaxs.module.smsread 244
-org.projectmaxs.module.smssend 196
-org.projectmaxs.module.smswrite 202
-org.projectmaxs.transport.xmpp 424
+org.opensatnav.android 922
+org.passwordmaker.android 2710
+org.paulmach.textedit 9564
+org.penghuang.tools.rotationlock 5836
+org.peterbaldwin.client.android.tinyurl 1050
+org.peterbaldwin.client.android.vlcremote 5297
+org.petero.droidfish 6530
+org.piwik.mobile 932
+org.pocketworkstation.pckeyboard 26215
+org.ppsspp.ppsspp 116127
+org.primftpd 3112
+org.projectmaxs.main 2025
+org.projectmaxs.module.bluetooth 835
+org.projectmaxs.module.bluetoothadmin 712
+org.projectmaxs.module.clipboard 852
+org.projectmaxs.module.contactsread 964
+org.projectmaxs.module.fileread 728
+org.projectmaxs.module.filewrite 737
+org.projectmaxs.module.phonestateread 812
+org.projectmaxs.module.ringermode 688
+org.projectmaxs.module.smsnotify 809
+org.projectmaxs.module.smsread 851
+org.projectmaxs.module.smssend 757
+org.projectmaxs.module.smswrite 754
+org.projectmaxs.transport.xmpp 1441
 org.projectvoodoo.audiomeasurementsplayer 73
-org.projectvoodoo.otarootkeeper 1540
-org.projectvoodoo.screentestpatterns 1788
-org.projectvoodoo.simplecarrieriqdetector 5543
-org.pulpdust.lesserpad 4208
-org.pyload.android.client 1692
-org.qii.weiciyuan 594
-org.quantumbadger.redreader 9458
-org.recentwidget 1117
-org.retroarch 1782
-org.sagemath.droid 1118
-org.scid.android 1698
-org.scoutant.blokish 11361
-org.scoutant.cc 2609
-org.servalproject 3380
-org.sickstache 850
-org.sipdroid.sipua 2907
-org.sixgun.ponyexpress 1695
-org.smerty.zooborns 1138
-org.sparkleshare.android 1556
-org.subsurface 353
-org.sufficientlysecure.keychain 3626
-org.sufficientlysecure.localcalendar 5973
-org.sufficientlysecure.viewer 7842
-org.sufficientlysecure.viewer.fontpack 1519
-org.swiftp 2270
-org.tamanegi.wallpaper.multipicture.dnt 2151
-org.tbrk.mnemododo 429
-org.thialfihar.android.apg 18016
-org.thoughtcrime.securesms 1861
-org.tint 10463
-org.tint.adblock 4626
-org.tof 6385
-org.tomdroid 6370
-org.torproject.android 59021
-org.totschnig.myexpenses 2891
-org.totschnig.sendwithftp 1625
-org.traccar.client 322
-org.transdroid 4137
-org.transdroid.search 1615
-org.tryton.client 544
-org.ttrssreader 8254
-org.tunesremote 741
-org.uaraven.e 5476
-org.videolan.vlc 30698
-org.vono.narau 1571
-org.vudroid 11974
-org.wahtod.wififixer 8359
-org.waxworlds.edam.importcontacts 769
+org.projectvoodoo.otarootkeeper 2057
+org.projectvoodoo.screentestpatterns 2356
+org.projectvoodoo.simplecarrieriqdetector 7375
+org.pulpdust.lesserpad 6342
+org.pyload.android.client 2422
+org.qii.weiciyuan 796
+org.quantumbadger.redreader 11348
+org.quovadit.apps.andof 1127
+org.recentwidget 1353
+org.retroarch 3201
+org.sagemath.droid 1385
+org.scid.android 2272
+org.scoutant.blokish 13354
+org.scoutant.cc 3559
+org.scummvm.scummvm 205566
+org.servDroid.web 560
+org.servalproject 4116
+org.sickstache 1102
+org.sipdroid.sipua 4318
+org.sixgun.ponyexpress 2011
+org.smerty.zooborns 1530
+org.softcatala.traductor 89
+org.sparkleshare.android 1878
+org.subsurface 505
+org.sudowars 319
+org.sufficientlysecure.keychain 4829
+org.sufficientlysecure.localcalendar 11005
+org.sufficientlysecure.standalonecalendar 2446
+org.sufficientlysecure.viewer 15866
+org.sufficientlysecure.viewer.fontpack 2961
+org.swiftp 2273
+org.systemcall.scores 318
+org.tamanegi.wallpaper.multipicture.dnt 2754
+org.tbrk.mnemododo 619
+org.thialfihar.android.apg 27108
+org.thoughtcrime.securesms 1862
+org.tigase.messenger.phone.pro 1921
+org.tint 15740
+org.tint.adblock 6624
+org.tof 7760
+org.tomdroid 7940
+org.torproject.android 68979
+org.totschnig.myexpenses 5035
+org.totschnig.sendwithftp 2165
+org.traccar.client 732
+org.transdroid 4981
+org.transdroid.full 2359
+org.transdroid.search 2673
+org.tryton.client 696
+org.ttrssreader 11275
+org.tunesremote 960
+org.uaraven.e 6478
+org.videolan.vlc 50166
+org.vono.narau 1983
+org.vudroid 14095
+org.wahtod.wififixer 9522
+org.waxworlds.edam.importcontacts 771
 org.webodf 364
-org.wheelmap.android.online 555
-org.wikimedia.commons 921
-org.wikipedia 19179
-org.wikipedia.wlm 667
-org.wiktionary 3249
-org.woltage.irssiconnectbot 2610
-org.wordpress.android 6560
-org.xbmc.android.remote 6694
-org.xcsoar 1714
-org.yaaic 6966
-org.yaxim.androidclient 6178
-org.yuttadhammo.BodhiTimer 4730
-org.yuttadhammo.tipitaka 1633
-org.zakky.memopad 3449
-org.zeitgeist.movement 536
-org.zeroxlab.zeroxbenchmark 5570
-org.zirco 13714
-paulscode.android.mupen64plus 2923
-paulscode.android.mupen64plusae 8363
-pl.magot.vetch.ancal 3619
-pro.dbro.bart 648
-pt.isec.tp.am 10387
-remuco.client.android 3227
-ro.ieval.fonbot 558
-ro.ui.pttdroid 2994
-ro.weednet.contactssync 2046
-ru.gelin.android.sendtosd 4075
-ru.gelin.android.weather.notification 12537
-ru.gelin.android.weather.notification.skin.blacktext 2352
-ru.gelin.android.weather.notification.skin.whitetext 3250
-ru.glesik.nostrangersms 1022
-ru.qrck.quitetaskmanager 3402
-ru.ttyh.neko259.notey 853
-se.anyro.nfc_reader 4649
-se.chalmers.doit 621
-se.erikofsweden.findmyphone 3045
-se.johanhil.clipboard 4102
-se.johanhil.duckduckgo 15103
-se.peterbjorkman.android.trafikinfo 202
-se.sandos.android.delayed 92
-seanfoy.wherering 1376
-si.modrajagoda.didi 1772
-siir.es.adbWireless 3803
-sk.madzik.android.logcatudp 790
-sk.vx.connectbot 9280
-sonoroxadc.garethmurfin.co.uk 3793
+org.wheelmap.android.online 703
+org.wikilovesmonuments 500
+org.wikimedia.commons 1371
+org.wikipedia 22636
+org.wikipedia.wlm 669
+org.wiktionary 4083
+org.woltage.irssiconnectbot 3350
+org.wordpress.android 8035
+org.xbmc.android.remote 8792
+org.xcsoar 2041
+org.yaaic 8235
+org.yabause.android 683
+org.yaxim.androidclient 7154
+org.yuttadhammo.BodhiTimer 5949
+org.yuttadhammo.tipitaka 3772
+org.zakky.memopad 4323
+org.zeitgeist.movement 749
+org.zephyrsoft.checknetwork 260
+org.zephyrsoft.trackworktime 342
+org.zeroxlab.zeroxbenchmark 9573
+org.zirco 16502
+paulscode.android.mupen64plus 2925
+paulscode.android.mupen64plusae 10599
+pe.moe.nori 74750
+pl.magot.vetch.ancal 3648
+pl.nkg.geokrety 243
+priv.twoerner.brightnesswidget 522
+pro.dbro.bart 839
+pro.oneredpixel.l9droid 491
+pt.isec.tp.am 12970
+remuco.client.android 3932
+ro.ieval.fonbot 1339
+ro.ui.pttdroid 4378
+ro.weednet.contactssync 2809
+ru.gelin.android.sendtosd 5168
+ru.gelin.android.weather.notification 15009
+ru.gelin.android.weather.notification.skin.blacktext 3093
+ru.gelin.android.weather.notification.skin.whitetext 4196
+ru.glesik.nostrangersms 1897
+ru.neverdark.silentnight 554
+ru.o2genum.coregame 206694
+ru.qrck.quitetaskmanager 3406
+ru.ttyh.neko259.notey 1127
+ru.valle.btc 441
+ru0xdc.rtkgps 118
+se.anyro.nfc_reader 6057
+se.chalmers.doit 624
+se.danielj.geometridestroyer 733
+se.erikofsweden.findmyphone 3788
+se.johanhil.clipboard 4937
+se.johanhil.duckduckgo 18752
+se.peterbjorkman.android.trafikinfo 203
+se.sandos.android.delayed 93
+seanfoy.wherering 2016
+si.modrajagoda.didi 2314
+siir.es.adbWireless 5850
+sk.madzik.android.logcatudp 1015
+sk.vx.connectbot 12074
+sonoroxadc.garethmurfin.co.uk 4806
 stericson.busybox.donate 390
-teaonly.droideye 3361
-tkj.android.homecontrol.mythmote 1928
-to.networld.android.divedroid 1189
-trikita.obsqr 6533
-tritop.android.SLWTrafficMeterWidget 1952
-tritop.android.androsens 8056
-tritop.androidSLWCpuWidget 2760
-tuioDroid.impl 1129
-uk.ac.cam.cl.dtg.android.barcodebox 3094
-uk.co.ashtonbrsc.android.intentintercept 2306
-uk.co.bitethebullet.android.token 263
-uk.co.jarofgreen.JustADamnCompass 4124
-uk.org.cardboardbox.wonderdroid 2095
-uk.org.ngo.squeezer 965
-urbanstew.RehearsalAssistant 3134
-us.bravender.android.dongsa 714
-us.lindanrandy.cidrcalculator 4815
-vnd.blueararat.kaleidoscope6 2660
-vu.de.urpool.quickdroid 6525
-wb.receiptspro 1376
-zame.GloomyDungeons.opensource.game 10270
+teaonly.droideye 4675
+tkj.android.homecontrol.mythmote 2419
+to.doc.android.ipv6config 2972
+to.networld.android.divedroid 1381
+trikita.obsqr 9366
+tritop.android.SLWTrafficMeterWidget 2496
+tritop.android.androsens 10732
+tritop.androidSLWCpuWidget 3489
+tuioDroid.impl 1372
+uk.ac.cam.cl.dtg.android.barcodebox 4429
+uk.ac.ed.inf.mandelbrotmaps 1158
+uk.co.ashtonbrsc.android.intentintercept 3439
+uk.co.bitethebullet.android.token 2235
+uk.co.danieljarvis.android.flashback 647
+uk.co.jarofgreen.JustADamnCompass 4955
+uk.org.cardboardbox.wonderdroid 2826
+uk.org.ngo.squeezer 1313
+urbanstew.RehearsalAssistant 3695
+us.bravender.android.dongsa 884
+us.lindanrandy.cidrcalculator 6697
+vnd.blueararat.kaleidoscope6 3503
+vu.de.urpool.quickdroid 7432
+wb.receiptspro 2279
+zame.GloomyDungeons.opensource.game 14884
diff --git a/stats/update_check_modes.txt b/stats/update_check_modes.txt
index efe1aec075..b91b87dece 100644
--- a/stats/update_check_modes.txt
+++ b/stats/update_check_modes.txt
@@ -1,7 +1,6 @@
-None 292
+None 98
 HTTP 1
-Tags 236
+Tags 380
 RepoTrunk 1
-Static 112
-AndroidManifest 5
-RepoManifest 253
+Static 108
+RepoManifest 504