diff --git a/metadata/android.tether.txt b/metadata/android.tether.txt
index daf37bd2f8..3c73d649b7 100644
--- a/metadata/android.tether.txt
+++ b/metadata/android.tether.txt
@@ -13,7 +13,13 @@ This application requires a "rooted"-device and(probably) a custom-kernel which
 .
 
 Requires Root:Yes
-Repo Type:git-svn
+
+Repo Type:svn
 Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 
-Build Version:2.0.7,26,r523
+Build Version:2.0.7,26,523,buildjni=yes
+
+Update Check Mode:Market
+Current Version:2.0.7
+Current Version Code:26
+
diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt
new file mode 100644
index 0000000000..3c4a012c6d
--- /dev/null
+++ b/metadata/cgeo.geocaching.txt
@@ -0,0 +1,21 @@
+Category:Navigation
+License:Apache2
+Web Site:http://www.cgeo.org
+Source Code:https://github.com/cgeo/c-geo-opensource
+Issue Tracker:https://github.com/cgeo/c-geo-opensource/issues
+Donate:https://www.paypal.com/si/cgi-bin/webscr?cmd=_flow&SESSION=wczJRQ7RLX09OOYlfZtWeC5zejaJpP9xZ5-cby5zCmoKvuI8FXtXadN-WKq&dispatch=5885d80a13c0db1f8e263663d3faee8d7283e7f0184a5674430f290db9e9c846
+
+Summary:Geo-caching client
+Description:
+Geocaching is a sport where people hide things and you go and find them.
+.
+
+Repo Type:git
+Repo:https://github.com/cgeo/c-geo-opensource.git
+
+Update Check Mode:Market
+Current Version:2012.06.28
+Current Version Code:20120628
+
+#Needs version naming properly, we can't have all versions being called "developer  build"
+#Build Version:"developer  build",20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main
diff --git a/metadata/cmupdaterapp.ui.txt b/metadata/cmupdaterapp.ui.txt
index b17cd71552..b6fb21344b 100644
--- a/metadata/cmupdaterapp.ui.txt
+++ b/metadata/cmupdaterapp.ui.txt
@@ -1,3 +1,4 @@
+Disabled:No longer useful
 Category:System
 License:GPLv2
 Web Site:http://code.google.com/p/cyanogen-updater/
diff --git a/metadata/com.agiro.scanner.android.txt b/metadata/com.agiro.scanner.android.txt
index cda959ae40..243bb0c041 100644
--- a/metadata/com.agiro.scanner.android.txt
+++ b/metadata/com.agiro.scanner.android.txt
@@ -1,3 +1,4 @@
+Disabled: no source for this application anymore and the build looks like it is disabled
 Category:Office
 License:Apache2
 Web Site:
diff --git a/metadata/com.alfray.asqare.txt b/metadata/com.alfray.asqare.txt
index 86abc2d61f..8faa014b6e 100644
--- a/metadata/com.alfray.asqare.txt
+++ b/metadata/com.alfray.asqare.txt
@@ -3,7 +3,6 @@ License:GPLv3
 Web Site:https://code.google.com/p/asqare/
 Source Code:https://code.google.com/p/asqare/source/list
 Issue Tracker:
-Donate:
 
 Summary:Remove the sprites by gathering colours
 Description:
@@ -17,4 +16,9 @@ The game offers two variations on the gameplay and manages a list of current gam
 Repo Type:git
 Repo:https://code.google.com/p/asqare/
 
-Build Version:1.3,103,61828d08
+Build Version:1.3,103,61828d08,subdir=asqare
+
+Update Check Mode:Market
+Current Version:1.2
+Current Version Code:102
+
diff --git a/metadata/com.ath0.rpn.txt b/metadata/com.ath0.rpn.txt
index feae872295..f13d511834 100644
--- a/metadata/com.ath0.rpn.txt
+++ b/metadata/com.ath0.rpn.txt
@@ -13,8 +13,9 @@ Repo Type:git
 Repo:https://github.com/lpar/RPN.git
 
 Build Version:1.8.1,10,199a87f7319b685e59d6847f1ff2417613f69c6e
+Build Version:2.0.1,15,0e8ba101ab
 
 Update Check Mode:Market
-Current Version:1.8
-Current Version Code:9
+Current Version:2.0.1
+Current Version Code:15
 
diff --git a/metadata/com.brocktice.JustSit.txt b/metadata/com.brocktice.JustSit.txt
index 2439f8ac2a..bb1d2a01f9 100644
--- a/metadata/com.brocktice.JustSit.txt
+++ b/metadata/com.brocktice.JustSit.txt
@@ -1,9 +1,8 @@
 Category:Science
 License:GPLv3/CCv3.0by
 Web Site:https://code.google.com/p/justsit/
-Source Code:https://code.google.com/p/justsit/source/list
+Source Code:https://code.google.com/p/justsit/source/checkout
 Issue Tracker:https://code.google.com/p/justsit/issues/list
-Donate:
 
 Summary:Meditation timer
 Description:
@@ -17,4 +16,9 @@ The name is inspired by the saying,
 Repo Type:git-svn
 Repo:http://justsit.googlecode.com/svn/trunk/
 
-Build Version:0.3.3,17,r24
+Build Version:0.3.3,17,24,subdir=JustSit
+
+Update Check Mode:Market
+Current Version:0.3.3
+Current Version Code:17
+
diff --git a/metadata/com.drodin.tuxrider.txt b/metadata/com.drodin.tuxrider.txt
index da452f142e..259e340585 100644
--- a/metadata/com.drodin.tuxrider.txt
+++ b/metadata/com.drodin.tuxrider.txt
@@ -1,4 +1,5 @@
-#possible antifeature ads
+Disabled:Proprietary dependencies
+AntiFeatures:Ads
 Category:Games
 License:GPLv2+
 Web Site:http://tuxrider.drodin.com/
@@ -15,7 +16,7 @@ Repo:git://github.com/drodin/TuxRider.git
 
 Update Check Mode:Market
 #Build Version:1.0.4 beta,6,67bce39cda321c225bc5
-Build Version:1.0.9 beta,11,36220e5
+Build Version:1.0.9 beta,11,36220e5,buildjni=yes
 
 Current Version:1.0.9
 Current Version Code:11
diff --git a/metadata/com.gcstar.scanner.txt b/metadata/com.gcstar.scanner.txt
index b0b9266776..6f18310dcf 100644
--- a/metadata/com.gcstar.scanner.txt
+++ b/metadata/com.gcstar.scanner.txt
@@ -10,7 +10,11 @@ Description:
 GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/viewcvs/gcstar/scanner
+Update Check Mode:Market
+Current Version:1.0
+Current Version Code:1
 
-Build Version:1.0,1,r2124
+#Source not retrievable from there
+#Repo Type:git-svn
+#Repo:http://svn.gna.org/viewcvs/gcstar/scanner
+#Build Version:1.0,1,2124
diff --git a/metadata/com.gcstar.viewer.txt b/metadata/com.gcstar.viewer.txt
index f525f55a9c..9f45c9f7ab 100644
--- a/metadata/com.gcstar.viewer.txt
+++ b/metadata/com.gcstar.viewer.txt
@@ -10,8 +10,10 @@ Description:
 GCstar is a cross-platform application for managing your collections. Detailed information on each item can be automatically retrieved from the internet and you can store additional data, such as the location or who you've lent it to. You may also search and filter your collection by many criteria. 
 .
 
-Repo Type:git-svn
-Repo:http://svn.gna.org/viewcvs/gcstar/viewer
+Update Check Mode:Market
+Current Version:2.9
+Current Version Code:11
 
-Build Version:name,code,commit/tag/revision
-Build Version:2.8,10,r2149
+#Repo Type:git-svn
+#Repo:http://svn.gna.org/viewcvs/gcstar/viewer
+#Build Version:2.8,10,2149
diff --git a/metadata/com.glTron.txt b/metadata/com.glTron.txt
index 1ad69293b5..9a4382ffd8 100644
--- a/metadata/com.glTron.txt
+++ b/metadata/com.glTron.txt
@@ -13,7 +13,9 @@ Relive the film as you try and cut off your opponents before they cut you off!!
 Repo Type:git
 Repo:https://github.com/Chluverman/android-gltron.git
 
-Build Version:1.1.1,3,acea0d6d803b4e24241455090c7b454252a5e0d0,subdir=GlTron
+Build Version:1.1.2,4,814e6eb9fc14e9620c13bc5c8480b442d2f5350e,subdir=GlTron
 
 Update Check Mode:Market
+Current Version:1.1.1
+Current Version Code:3
 
diff --git a/metadata/com.gluegadget.hndroid.txt b/metadata/com.gluegadget.hndroid.txt
index 86f5df12f1..c44e7a9c4a 100644
--- a/metadata/com.gluegadget.hndroid.txt
+++ b/metadata/com.gluegadget.hndroid.txt
@@ -8,4 +8,10 @@ Summary:Hacker News Client
 Description:
 No description available
 .
+
 Build Version:0.2.1,3,9d49cb7564
+
+Update Check Mode:Market
+Current Version:0.4
+Current Version Code:5
+
diff --git a/metadata/com.google.code.geobeagle.txt b/metadata/com.google.code.geobeagle.txt
index 9d36d6985b..af3a165680 100644
--- a/metadata/com.google.code.geobeagle.txt
+++ b/metadata/com.google.code.geobeagle.txt
@@ -3,7 +3,6 @@ License:Apache 2.0
 Web Site:http://code.google.com/p/geobeagle/
 Source Code:http://code.google.com/p/geobeagle/source/checkout	
 Issue Tracker:http://code.google.com/p/geobeagle/issues/list
-Donate:
 
 Summary:Search for geocaches and letterboxes near you
 Description:
@@ -18,6 +17,9 @@ Need more help? Join our discussion group!
 Repo Type:hg
 Repo:https://code.google.com/p/geobeagle/
 
+Update Check Mode:Market
+Current Version:1.4.15
+Current Version Code:206
+
 #Needs dependencies (unspecified, but at least roboguice)
 #Build Version:1.4.15,206,a868e85b7acf,subdir=trunk/GeoBeagle
-
diff --git a/metadata/com.ihunda.android.binauralbeat.txt b/metadata/com.ihunda.android.binauralbeat.txt
index 9c00480fff..a5487f8f0a 100644
--- a/metadata/com.ihunda.android.binauralbeat.txt
+++ b/metadata/com.ihunda.android.binauralbeat.txt
@@ -23,7 +23,8 @@ 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,e65c60a8ac
+#Missing various things, won't build...
+#Build Version:1.7,34,e65c60a8ac
 
 Update Check Mode:Market
 Current Version:1.7
diff --git a/metadata/com.intervigil.micdroid.txt b/metadata/com.intervigil.micdroid.txt
index 75c23480a9..72f083b49b 100644
--- a/metadata/com.intervigil.micdroid.txt
+++ b/metadata/com.intervigil.micdroid.txt
@@ -4,7 +4,6 @@ License:GPLv2+
 Web Site:http://www.intervigil.net/pages/micdroid
 Source Code:https://github.com/intervigilium/MicDroid/
 Issue Tracker:https://github.com/intervigilium/MicDroid/issues
-Donate:
 
 Summary:Pitch correct your voice
 Description:
@@ -18,3 +17,8 @@ Repo Type:git
 Repo:git://github.com/intervigilium/MicDroid.git
 
 Build Version:0.44,34,cf4505a03e
+
+Update Check Mode:Market
+Current Version:0.46
+Current Version Code:36
+
diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt
index f901860a05..a2c4cbbce5 100644
--- a/metadata/com.morphoss.acal.txt
+++ b/metadata/com.morphoss.acal.txt
@@ -37,6 +37,6 @@ Build Version:1.55,55,r1.55,target=android-8
 Build Version:1.56,56,r1.56,target=android-8
 
 Update Check Mode:RepoManifest
-Current Version:1.54
-Current Version Code:54
+Current Version:1.56
+Current Version Code:56
 
diff --git a/metadata/com.roozen.SoundManager.txt b/metadata/com.roozen.SoundManager.txt
index ca09f4d78a..1a411328c9 100644
--- a/metadata/com.roozen.SoundManager.txt
+++ b/metadata/com.roozen.SoundManager.txt
@@ -16,6 +16,8 @@ Repo Type:svn
 Repo:http://app-soundmanager.googlecode.com/svn/tags/
 
 Build Version:2.0.0,18,127,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes
+#Missing resources....
+#Build Version:2.1.0,19,156,subdir=SoundManager-2.0.0,target=android-8,fixapos=yes # release candidate since last april
 
 Update Check Mode:Market
 Current Version:2.0.0
diff --git a/metadata/com.scottmain.android.searchlight.txt b/metadata/com.scottmain.android.searchlight.txt
index a0f60e0168..c09c9ac5e0 100644
--- a/metadata/com.scottmain.android.searchlight.txt
+++ b/metadata/com.scottmain.android.searchlight.txt
@@ -13,7 +13,7 @@ Repo Type:git-svn
 Repo:http://search-light.googlecode.com/svn/trunk/
 
 Build Version:1.0,1,2
-Build Version:1.3,4,!Source not available
+Build Version:1.3,4,4,target=android-15
 
 Update Check Mode:Market
 Current Version:1.3
diff --git a/metadata/com.serone.desktoplabel.txt b/metadata/com.serone.desktoplabel.txt
index 0caa940798..77f21f378e 100644
--- a/metadata/com.serone.desktoplabel.txt
+++ b/metadata/com.serone.desktoplabel.txt
@@ -9,7 +9,11 @@ Description:
 Allows you to add custom widgets to your 'desktop' to label things.
 .
 
+Repo Type:svn
+Repo:http://desktoplabel.googlecode.com/svn/DesktopLabel
+
+Build Version:1.4.0,7,16
+
 Update Check Mode:Market
 Current Version:1.3.0
 Current Version Code:6
-
diff --git a/metadata/com.uploadedlobster.PwdHash.txt b/metadata/com.uploadedlobster.PwdHash.txt
index 089ba17412..6b2c044293 100644
--- a/metadata/com.uploadedlobster.PwdHash.txt
+++ b/metadata/com.uploadedlobster.PwdHash.txt
@@ -1,32 +1,19 @@
 Category:Internet
-<<<<<<< HEAD
 License:BSD
 Web Site:https://github.com/phw/Android-PwdHash
 Source Code:https://github.com/phw/Android-PwdHash
 Issue Tracker:https://github.com/phw/Android-PwdHash/issues
-Donate:
 
 Summary:Create passwords from website addresses
 Description:
 Lightweight tool to generate website specific, theft-resistant passwords. Just use the "Share page" option in the Android browser or open Password Hash directly. Based upon and compatible with pwdhash.com.
-=======
-License:3-clause BSD
-Web Site:https://github.com/phw/Android-PwdHash
-Source Code:https://github.com/phw/Android-PwdHash
-Issue Tracker:https://github.com/phw/Android-PwdHash/issues
-
-Summary:Password Hash
-Description:
-Lightweight tool to generate website specific, theft-resistant passwords. Just use the "Share page" option in the Android browser or open Password Hash directly. Compatible with pwdhash.com.
->>>>>>> 438e06ac85a8695a427e8a54a9244aaa65c4a008
 .
 
 Repo Type:git
 Repo:https://github.com/phw/Android-PwdHash.git
 
-<<<<<<< HEAD
-Build Version:1.2.4,7,069d5044
-=======
 Build Version:1.3.0,9,1.3.0
 
->>>>>>> 438e06ac85a8695a427e8a54a9244aaa65c4a008
+Update Check Mode:Market
+Current Version:1.3.0
+Current Version Code:9
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index b7cc5e530f..9d41f2c336 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -25,4 +25,5 @@ Features include:
 Repo Type:git-svn
 Repo:http://zanavi.cc/zanavi_public1/navit
 
-Build Version:1.0.52
+#......
+#Build Version:1.0.52
diff --git a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
index 9da8c5d88e..9d85e8a0f2 100644
--- a/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
+++ b/metadata/de.antonfluegge.android.yubnubwidgetadfree.txt
@@ -13,4 +13,5 @@ Yubnub is a social command line for the web. By typing short commands into the w
 Repo Type:git
 Repo:git://git.code.sf.net/p/yubnubapp/code
 
-Build Version:1.1.4,6,bb92bd86a
+#Doesn't build, looks like missing source/dependencies...
+#Build Version:1.1.4,6,bb92bd86a,subdir=yubnubapp-code
diff --git a/metadata/de.danielweisser.android.ldapsync.txt b/metadata/de.danielweisser.android.ldapsync.txt
index 291e4a9b82..e57f388383 100644
--- a/metadata/de.danielweisser.android.ldapsync.txt
+++ b/metadata/de.danielweisser.android.ldapsync.txt
@@ -3,7 +3,6 @@ License:Apache2
 Web Site:http://www.danielweisser.de/blog
 Source Code:https://github.com/weisserd/LDAP-Sync
 Issue Tracker:https://github.com/weisserd/LDAP-Sync/issues
-Donate:
 
 Summary:Sync your contacts with LDAP
 Description:
@@ -14,3 +13,8 @@ Repo Type:git
 Repo:https://github.com/weisserd/LDAP-Sync.git
 
 Build Version:1.5,12,6198272a
+
+Update Check Mode:Market
+Current Version:1.5
+Current Version Code:12
+
diff --git a/metadata/de.kugihan.dictionaryformids.hmi_android.txt b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
index 587a4b1896..eb29c6b669 100644
--- a/metadata/de.kugihan.dictionaryformids.hmi_android.txt
+++ b/metadata/de.kugihan.dictionaryformids.hmi_android.txt
@@ -14,7 +14,8 @@ Beyond language dictionaries, it is possible to set up any other dictionary for
 Please note that the dictionaries that are set up for DictionaryForMIDs may have different copyrights. All dictionaries that can be downloaded from the website are free to use. Several dictionaries come with the app and more are provided in the section dictionaries for download of the website.
 .
 
-Repo Type:git-svn
-Repo:http://dictionarymid.sourceforge.net/android-dl.html
+#Not valid....
+#Repo Type:git-svn
+#Repo:http://dictionarymid.sourceforge.net/android-dl.html
 
-Build Version:0.90.1,89,r461
+#Build Version:0.90.1,89,461
diff --git a/metadata/es.cesar.quitesleep.txt b/metadata/es.cesar.quitesleep.txt
index e03d932241..2bd08fe5af 100644
--- a/metadata/es.cesar.quitesleep.txt
+++ b/metadata/es.cesar.quitesleep.txt
@@ -23,6 +23,9 @@ Repo:https://code.google.com/p/quitesleep/
 Build Version:2.0,5,fbf8f2db2b36,prebuild=rm -rf libs && mv lib libs
 Build Version:2.0.3,9,619ef22277cc,prebuild=rm -rf libs && mv lib libs
 
+#Needs ActionBarSherlock srclib setup
+#Build Version:3,13,0a3dcf9b9c25,subdir=quitesleep3,prebuild=rm -rf libs && mv lib libs
+
 Update Check Mode:Market
 Current Version:3
 Current Version Code:14
diff --git a/metadata/fr.miximum.napply.txt b/metadata/fr.miximum.napply.txt
index 407789e8e9..89a3aebc67 100644
--- a/metadata/fr.miximum.napply.txt
+++ b/metadata/fr.miximum.napply.txt
@@ -19,4 +19,6 @@ Repo:https://github.com/thibault/Napply.git
 Build Version:1.2,2,ef1014908ef9005f7783632aba6734a5d294212c,subdir=Napply,init=rm -rf build.xml
 
 Update Check Mode:Market
+Current Version:1.2
+Current Version Code:2
 
diff --git a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
index 10bffc01e2..c36d1b89f7 100644
--- a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
+++ b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt
@@ -19,4 +19,5 @@ The Diktofon app provides also language independent features like tagging, high
 Repo Type:git
 Repo:https://github.com/Kaljurand/Diktofon.git
 
-Build Version:0.9.76,976,8036d6c7
+#Missing dependencies (and possibly proprietary)
+#Build Version:0.9.76,976,8036d6c7,subdir=app
diff --git a/metadata/me.shkschneider.dropbearserver.txt b/metadata/me.shkschneider.dropbearserver.txt
index 5e12cb4563..eba69bfdb1 100644
--- a/metadata/me.shkschneider.dropbearserver.txt
+++ b/metadata/me.shkschneider.dropbearserver.txt
@@ -1,3 +1,4 @@
+Disabled:Can't build properly (yet?) - see comment
 #there are dropbear binaries in the repo from an external source but they can be built
 #from https://github.com/shkschneider/android_external_dropbear . 
 
@@ -33,7 +34,6 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/shkschneider/android_DropBearServer.git
 
-#Generated by import.py - check this is the right version, and find the right commit!
 Build Version:1.7.0,170,b943a751dc
 
 Update Check Mode:Market
diff --git a/metadata/mixedbit.speechtrainer.txt b/metadata/mixedbit.speechtrainer.txt
index a22fcbd80b..64a1e7adc8 100644
--- a/metadata/mixedbit.speechtrainer.txt
+++ b/metadata/mixedbit.speechtrainer.txt
@@ -15,6 +15,7 @@ Repo Type:git
 Repo:git://github.com/wrr/speech_trainer.git
 
 Build Version:1.01,2,109eba6da3eac93c6e0d445f488433452387f815,subdir=app,target=android-10
+Build Version:1.04,5,0a2507a168,subdir=app,target=android-10
 
 Update Check Mode:Market
 Current Version:1.04
diff --git a/metadata/mobi.cyann.nstools.txt b/metadata/mobi.cyann.nstools.txt
index e131417a49..b3e7b7fa67 100644
--- a/metadata/mobi.cyann.nstools.txt
+++ b/metadata/mobi.cyann.nstools.txt
@@ -14,4 +14,5 @@ Root Required:Yes
 Repo Type:git
 Repo:https://github.com/arifhn/NSTools.git
 
-Build Version:1.16,20,caa8eec7
+#Missing dependencies, should be easy to solve, they are already in our extlib
+#Build Version:1.16,20,caa8eec7
diff --git a/metadata/net.avs234.txt b/metadata/net.avs234.txt
index 2040afcf99..a694f73c08 100644
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@@ -4,7 +4,7 @@ Web Site:http://code.google.com/p/andless/
 Source Code:http://code.google.com/p/andless/source/checkout
 Issue Tracker:http://code.google.com/p/andless/issues/list
 
-Summary:Audio player for lossless files
+Summary:Audio player
 Description:
 Audio player that plays lossless files (FLAC/APE/MPC/WV) as well as
 any formats natively supported by Android. CUE sheets and playlists
diff --git a/metadata/net.jaqpot.netcounter.txt b/metadata/net.jaqpot.netcounter.txt
index 5acfe338cd..7ed968f415 100644
--- a/metadata/net.jaqpot.netcounter.txt
+++ b/metadata/net.jaqpot.netcounter.txt
@@ -11,6 +11,12 @@ to you in an easy to read format. It can also alert you when you reach a predefi
 limit.
 .
 
+#Not valid...
+#Repo Type:git-svn
+#Repo:https://www.jaqpot.net/svn/android/netcounter/trunk 
+
+#Build Version:0.14.1,22,153
+
 Update Check Mode:Market
 Current Version:0.14.1
 Current Version Code:22
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 1e0d180f11..78692253dd 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -3,7 +3,7 @@ License:LGPL
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donation:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
 
 Name:OsmAnd+
 Summary:OpenStreetMap navigation & routing
diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt
index 1dc13f2718..a7fd8f4c36 100644
--- a/metadata/net.osmand.txt
+++ b/metadata/net.osmand.txt
@@ -3,7 +3,7 @@ License:LGPL
 Web Site:http://code.google.com/p/osmand/
 Source Code:https://github.com/osmandapp/Osmand
 Issue Tracker:http://code.google.com/p/osmand/issues/list
-Donation:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
+Donate:https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=Vf3sHQ7L04cDtH85Y50oV6iGrMczL-knML1tuAbtUoNJ96-3axviegypjVi&dispatch=5885d80a13c0db1f8e263663d3faee8d8494db9703d295b4a2116480ee01a05c
 
 Summary:OpenStreetMap navigation & routing
 Description:
diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt
index 9184521ee0..19c20a697f 100644
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@@ -23,6 +23,7 @@ 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
 
 Update Check Mode:Market
 Current Version:0.4.9
diff --git a/metadata/org.andnav.osm.txt b/metadata/org.andnav.osm.txt
index 6d9ab70530..dd513dda82 100644
--- a/metadata/org.andnav.osm.txt
+++ b/metadata/org.andnav.osm.txt
@@ -9,6 +9,12 @@ Description:
 Map viewer using OpenStreetMap tiles.
 .
 
+Repo Type:git-svn
+Repo:http://osmdroid.googlecode.com/svn/trunk/
+
+#Doesn't build - needs lots of work on building dependencies
+#Build Version:3.0.9,10,1098,subdir=OpenStreetMapViewer
+
 Update Check Mode:Market
 Current Version:2.0.0
 Current Version Code:3
diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt
index dd64514201..373b0dd548 100644
--- a/metadata/org.aprsdroid.app.txt
+++ b/metadata/org.aprsdroid.app.txt
@@ -13,4 +13,5 @@ Report your position to the APRS-IS network and view nearby stations on a map. A
 Repo Type:git
 Repo:https://github.com/ge0rg/aprsdroid.git
 
-Build Version:1.2.0,10,6060f53846
+#Missing AudioBufferProcessor.java...
+#Build Version:1.2.0,10,6060f53846
diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt
index 6525e245fc..d523079fc2 100644
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@@ -2,7 +2,7 @@ Category:Reading
 License:GPLv2+
 Web Site:http://www.fbreader.org/FBReaderJ/
 Source Code:https://github.com/geometer/FBReaderJ
-Issue Tracker:
+Issue Tracker:https://github.com/geometer/FBReaderJ/issues
 Donate:http://www.fbreader.org/donation/make.php
 
 Summary:An e-book reader
@@ -33,8 +33,10 @@ Build Version:1.2.4,102041,6426bcf131d4,buildjni=yes,target=android-10,prebuild=
 Build Version:1.2.6,102061,1.2.6,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 Build Version:1.3.3,103031,1.3.3,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 Build Version:1.3.6,103061,a16e3eb7ff731edea99248f8a7c1633148a26236,buildjni=yes,target=android-10,prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+#Doesn't build...
+#Build Version:1.5.5,105051,2fe2ee64c230165b05dd62a7a37d15bce13972ee
 
 Update Check Mode:None
-Current Version:1.3.6
-Current Version Code:103061
+Current Version:1.5.5
+Current Version Code:105051
 
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index ca713f7b01..25d0fa1baf 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -24,8 +24,10 @@ forceversion=yes
 Build Version:2.9.0,21,03a9c9c9d5acf3b1b659e407c18d072309d50e3a,\
 init=cd ../../ && autoconf && ./configure,buildjni=yes,subdir=players/android,target=android-14,\
 forceversion=yes
+#Needs work to build...
+#Build Version:3.2.0,30,2c7b8dd28dff53b876ad19498d0f634805fd0a2
 
 Update Check Mode:Market
-Current Version:3.1.0
-Current Version Code:27
+Current Version:3.2.1
+Current Version Code:31
 
diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt
index ea910b8e24..5cd550d400 100644
--- a/metadata/org.liberty.android.fantastischmemo.txt
+++ b/metadata/org.liberty.android.fantastischmemo.txt
@@ -15,6 +15,9 @@ Repo:https://github.com/helloworld1/AnyMemo.git
 
 Build Version:8.3.0,135,a591497118fe2cae101027add50d835c7fe6ed27,target=android-13,prebuild=rm -rf jni/
 Build Version:8.3.1,136,!No source in repo
+#Doesn't build, may need some adjustments...
+#Build Version:9.0.10,160,2da472cae9a732a8ad1144a93ab7e83201b8f0a6,target=android-13,prebuild=rm -rf jni/
+
 
 Update Check Mode:Market
 Current Version:9.0.10
diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
index 98c8d2a77b..2ef8b10459 100644
--- a/metadata/org.mariotaku.twidere.txt
+++ b/metadata/org.mariotaku.twidere.txt
@@ -1,6 +1,7 @@
 Category:Internet
 License:GPLv3
 Web Site:https://github.com/mariotaku/twidere/
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mariotaku.lee%40gmail%2ecom&item_name=Donate%20to%20Twidere
 Source Code:https://github.com/mariotaku/twidere/
 Issue Tracker:https://github.com/mariotaku/twidere/issues
 
@@ -12,10 +13,12 @@ Twitter and Identi.ca client, with many powerful features.
 Repo Type:git
 Repo:git://github.com/mariotaku/twidere.git
 
-#Can't get this to build - error as follows:
-#StatusComposeEditText.java:70: type parameters of <T>void cannot be determined; no unique maximal instance exists for type variable T with upper bounds android.widget.ListAdapter,android.widget.Filterable
-#Build Version:0.1.1,28,50c9bc94151904f12963d114e0afdd2aa9691fb5,target=Google Inc.:Google APIs:16
+# 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
 
 Update Check Mode:Market
-Current Version:0.1.0 update5
-Current Version Code:27
+Current Version:0.1.3
+Current Version Code:31
+
diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt
index 40c286551b..b476b5aeb6 100644
--- a/metadata/org.mozilla.firefox.txt
+++ b/metadata/org.mozilla.firefox.txt
@@ -14,6 +14,6 @@ web pages, which implements current and anticipated web standards.
 #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/
 Update Check Mode:Market
-Current Version:14.0
-Current Version Code:2012062216
+Current Version:14.0.1
+Current Version Code:2012071317
 
diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt
index c0befec986..5c2404784b 100644
--- a/metadata/org.mozilla.firefox_beta.txt
+++ b/metadata/org.mozilla.firefox_beta.txt
@@ -13,6 +13,6 @@ Beta version of Firefox Mobile web browser.
 #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/latest/android/multi/
 Update Check Mode:Market
-Current Version:14.0
-Current Version Code:2012062212
+Current Version:15.0
+Current Version Code:2012072419
 
diff --git a/metadata/org.scoutant.blokish.txt b/metadata/org.scoutant.blokish.txt
index d2e7655b60..1bb9025318 100644
--- a/metadata/org.scoutant.blokish.txt
+++ b/metadata/org.scoutant.blokish.txt
@@ -17,8 +17,9 @@ Build Version:1.4,7,82ca58cdd26797f9ba9519e79c54031282d066af,target=android-10
 Build Version:1.5,8,e6ab83e8832f03d78bf3f8deae33acb22a7ba520,target=android-10
 Build Version:1.6,9,ebd1b966b70e,target=android-10
 Build Version:1.7,10,!requires proprietary "heyzap" library
+Build Version:1.8,11,a297e22247bb1ef7ecd4e764124703488354626d,target=android-10
 
 Update Check Mode:None
-Current Version:1.6
-Current Version Code:9
+Current Version:1.8
+Current Version Code:11
 
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 5cda36093a..7236166aed 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -3,7 +3,7 @@ License:BSD
 Web Site:http://www.torproject.org/docs/android.html.en
 Source Code:https://svn.torproject.org/svn/projects/android/
 Issue Tracker:https://trac.torproject.org/projects/tor
-Donation:https://www.torproject.org/donate/donate.html.en
+Donate:https://www.torproject.org/donate/donate.html.en
 
 Summary:Tor (anonymity) client
 Description:
diff --git a/metadata/org.ttrssreader.txt b/metadata/org.ttrssreader.txt
index b0011b62e5..b1781b27a3 100644
--- a/metadata/org.ttrssreader.txt
+++ b/metadata/org.ttrssreader.txt
@@ -33,8 +33,9 @@ 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
 
 Update Check Mode:Market
-Current Version:1.32
-Current Version Code:1320
+Current Version:1.33
+Current Version Code:1330
 
diff --git a/metadata/org.wiktionary.txt b/metadata/org.wiktionary.txt
index a80105a0be..e0b0ff04e5 100644
--- a/metadata/org.wiktionary.txt
+++ b/metadata/org.wiktionary.txt
@@ -15,4 +15,6 @@ Repo:https://github.com/wikimedia/WiktionaryMobile.git
 Build Version:1.0.1,1,62466913087ca6,submodules=yes
 
 Update Check Mode:Market
+Current Version:1.0.1
+Current Version Code:1
 
diff --git a/metadata/pl.magot.vetch.ancal.txt b/metadata/pl.magot.vetch.ancal.txt
index 4ecb822e71..edae35be2c 100644
--- a/metadata/pl.magot.vetch.ancal.txt
+++ b/metadata/pl.magot.vetch.ancal.txt
@@ -14,3 +14,7 @@ Repo:http://ancal.googlecode.com/svn/trunk/
 
 Build Version:1.6,32,23,fixtrans=yes
 
+Update Check Mode:Market
+Current Version:1.5
+Current Version Code:31
+
diff --git a/metadata/se.sandos.android.delayed.txt b/metadata/se.sandos.android.delayed.txt
index c2e6e7f555..b1827eabc1 100644
--- a/metadata/se.sandos.android.delayed.txt
+++ b/metadata/se.sandos.android.delayed.txt
@@ -13,4 +13,4 @@ Description:
 Repo Type:hg
 Repo:https://code.google.com/p/android-delayed/
 
-Build Version:0.9-BETA5,18,d89732dab
+Build Version:0.9-BETA5,18,d89732dab,target=android-15
diff --git a/metadata/sk.baka.aedict.txt b/metadata/sk.baka.aedict.txt
index ca87d8c520..3e748c7246 100644
--- a/metadata/sk.baka.aedict.txt
+++ b/metadata/sk.baka.aedict.txt
@@ -31,4 +31,5 @@ Allows automatic download of a German/French EDict, the names dictionary and the
 Repo Type:hg
 Repo:https://code.google.com/p/aedict/
 
-Build Version:2.10,2100,df770685
+#Doesn't build, needs work...
+#Build Version:2.10,2100,df770685
diff --git a/stats/known_apks.txt b/stats/known_apks.txt
index 66dc60a704..3a1846ebf4 100644
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@@ -123,6 +123,7 @@ alogcat-2.1.4.apk org.jtb.alogcat 2010-11-21
 andLess_05202011.apk net.avs234 2011-05-20
 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
 apps.droidnotify_27.apk apps.droidnotify 2012-01-21
 apps.droidnotify_29.apk apps.droidnotify 2012-01-28
@@ -143,6 +144,7 @@ com.addi_37.apk com.addi 2012-02-25
 com.addi_40.apk com.addi 2012-02-25
 com.addi_44.apk com.addi 2012-05-12
 com.agiro.scanner.android_2.apk com.agiro.scanner.android 2011-01-27
+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.andrewshu.android.reddit_67.apk com.andrewshu.android.reddit 2011-01-15
@@ -171,6 +173,7 @@ com.angrydoughnuts.android.alarmclock_8.apk com.angrydoughnuts.android.alarmcloc
 com.anoshenko.android.mahjongg_14.apk com.anoshenko.android.mahjongg 2012-02-12
 com.appengine.paranoid_android.lost_12.apk com.appengine.paranoid_android.lost 2012-01-08
 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_9.apk com.ath0.rpn 2012-02-10
 com.axelby.podax_12.apk com.axelby.podax 2012-01-21
 com.axelby.podax_14.apk com.axelby.podax 2012-03-20
@@ -184,6 +187,7 @@ com.beem.project.beem_7.apk com.beem.project.beem 2011-02-03
 com.beem.project.beem_9.apk com.beem.project.beem 2012-01-10
 com.boardgamegeek_20.apk com.boardgamegeek 2011-09-26
 com.boardgamegeek_21.apk com.boardgamegeek 2011-12-31
+com.brocktice.JustSit_17.apk com.brocktice.JustSit 2012-07-26
 com.bwx.bequick_201012060.apk com.bwx.bequick 2011-01-29
 com.bwx.bequick_201106160.apk com.bwx.bequick 2011-06-29
 com.bwx.bequick_201107260.apk com.bwx.bequick 2011-08-09
@@ -233,6 +237,7 @@ com.ghostsq.commander_163.apk com.ghostsq.commander 2012-02-06
 com.ghostsq.commander_164.apk com.ghostsq.commander 2012-02-15
 com.ghostsq.commander_94.apk com.ghostsq.commander 2011-04-02
 com.ghostsq.commander_97.apk com.ghostsq.commander 2011-04-02
+com.glTron_4.apk com.glTron 2012-07-26
 com.google.android.diskusage_2004.apk com.google.android.diskusage 2011-01-31
 com.google.android.diskusage_2005.apk com.google.android.diskusage 2011-03-10
 com.google.android.diskusage_2103.apk com.google.android.diskusage 2011-05-16
@@ -303,6 +308,7 @@ com.morphoss.acal_38.apk com.morphoss.acal 2012-01-20
 com.morphoss.acal_53.apk com.morphoss.acal 2012-07-06
 com.morphoss.acal_54.apk com.morphoss.acal 2012-07-06
 com.morphoss.acal_55.apk com.morphoss.acal 2012-07-12
+com.morphoss.acal_56.apk com.morphoss.acal 2012-07-21
 com.mp3tunes.android.player_89.apk com.mp3tunes.android.player 2011-04-09
 com.namelessdev.mpdroid_20.apk com.namelessdev.mpdroid 2012-01-29
 com.nexes.manager_212.apk com.nexes.manager 2011-03-09
@@ -314,7 +320,9 @@ com.replica.replicaisland_14.apk com.replica.replicaisland 2011-03-03
 com.ringdroid_20500.apk com.ringdroid 2011-03-26
 com.roozen.SoundManager_18.apk com.roozen.SoundManager 2011-03-03
 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.seavenois.tetris_1.apk com.seavenois.tetris 2012-03-10
+com.serone.desktoplabel_7.apk com.serone.desktoplabel 2012-07-26
 com.showmehills_2.apk com.showmehills 2012-05-29
 com.showmehills_4.apk com.showmehills 2012-05-29
 com.smorgasbork.hotdeath_3.apk com.smorgasbork.hotdeath 2011-12-06
@@ -331,6 +339,7 @@ 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.unitedcoders.android.gpodroid_12.apk com.unitedcoders.android.gpodroid 2012-01-08
+com.uploadedlobster.PwdHash_9.apk com.uploadedlobster.PwdHash 2012-07-21
 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
@@ -354,6 +363,7 @@ cz.romario.opensudoku_1104.apk cz.romario.opensudoku 2012-01-12
 cz.romario.opensudoku_1105.apk cz.romario.opensudoku 2012-01-12
 de.blau.android.Application_14.apk de.blau.android
 de.blau.android_14.apk de.blau.android 2012-05-16
+de.danielweisser.android.ldapsync_12.apk de.danielweisser.android.ldapsync 2012-07-26
 de.delusions.measure_9.apk de.delusions.measure 2012-03-23
 de.duenndns.gmdice_6.apk de.duenndns.gmdice 2012-04-20
 de.fmaul.android.cmis_8.apk de.fmaul.android.cmis 2012-03-10
@@ -461,6 +471,7 @@ li.klass.fhem_58.apk li.klass.fhem 2012-04-20
 linphone-android-1.0.15.apk org.linphone 2010-11-16
 linphone-android-1.1.6.apk org.linphone
 linphone-android-1.2.1.apk org.linphone 2011-09-29
+linphone-android-1.3.2.apk org.linphone 2012-07-21
 me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07-03
 me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10-02
 me.guillaumin.android.osmtracker_22.apk me.guillaumin.android.osmtracker 2012-02-05
@@ -469,6 +480,7 @@ mixare-0062.apk org.mixare
 mixare-0063.apk org.mixare
 mixare-v082.apk org.mixare 2012-05-17
 mixedbit.speechtrainer_2.apk mixedbit.speechtrainer 2011-11-28
+mixedbit.speechtrainer_5.apk mixedbit.speechtrainer 2012-07-26
 mobileorg-release.apk com.matburt.mobileorg 2011-02-19
 mustard-0.1.10.apk org.mustard.android
 mustard-0.1.12b.apk org.mustard.android
@@ -545,6 +557,7 @@ net.sourceforge.servestream_54.apk net.sourceforge.servestream 2012-01-19
 net.sourceforge.servestream_56.apk net.sourceforge.servestream 2012-02-21
 net.sourceforge.servestream_57.apk net.sourceforge.servestream 2012-03-21
 net.sourceforge.servestream_58.apk net.sourceforge.servestream 2012-03-27
+net.sourceforge.servestream_59.apk net.sourceforge.servestream 2012-07-26
 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
@@ -730,8 +743,10 @@ org.pocketworkstation.pckeyboard_1022.apk org.pocketworkstation.pckeyboard 2011-
 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.projectvoodoo.simplecarrieriqdetector_16.apk org.projectvoodoo.simplecarrieriqdetector 2012-07-26
 org.pyload.android.client_12.apk org.pyload.android.client 2012-07-13
 org.scoutant.blokish_1.apk org.scoutant.blokish 2011-08-25
+org.scoutant.blokish_11.apk org.scoutant.blokish 2012-07-26
 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
@@ -833,6 +848,7 @@ se.johanhil.clipboard_2.apk se.johanhil.clipboard 2011-03-10
 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
 sms-backup-plus-v1.2.apk com.zegoggles.smssync 2010-11-19
 sms-backup-plus-v1.3.2.apk com.zegoggles.smssync
 sms-backup-plus-v1.3.3.apk com.zegoggles.smssync
diff --git a/stats/latestapps.txt b/stats/latestapps.txt
index 0298c7c542..89a0be0e69 100644
--- a/stats/latestapps.txt
+++ b/stats/latestapps.txt
@@ -1,10 +1,10 @@
-org.opengpx
-org.pyload.android.client
-eu.domob.angulo
-org.beide.bomber
-com.jotabout.screeninfo
-org.woltage.irssiconnectbot
-wb.receiptspro
-org.madore.android.unicodeMap
-in.shick.diode
-no.rkkc.bysykkel
+com.brocktice.JustSit
+com.alfray.asqare
+android.tether
+org.projectvoodoo.simplecarrieriqdetector
+com.glTron
+se.sandos.android.delayed
+de.danielweisser.android.ldapsync
+com.uploadedlobster.PwdHash
+eu.domob.anacam
+org.wiktionary
diff --git a/stats/licenses.txt b/stats/licenses.txt
index 14fbd3d062..40ec7f5441 100644
--- a/stats/licenses.txt
+++ b/stats/licenses.txt
@@ -1,21 +1,24 @@
-GPLv2+ 15
-GPL 6
-New BSD 2
-LGPL 5
-EPLv1 1
-GPLv3+ 25
-Unknown 4
-GPLv2 43
-GPLv3 112
-EUPL 1
-Apache2 66
-Expat 1
-EPL 1
-Apache 2.0 1
-MPL 2
-BSD 6
 Public Domain 1
-AGPLv3 4
+GPL 6
+GPLv3+ 25
+Unknown 3
+GPLv2 46
+GPLv3 121
+Apache2 68
+EPL 1
 AGPL 1
 MIT 12
 CCBYSA 1
+WTFPL 1
+Apache 2.0 2
+BSD 7
+GPLv2+ 19
+EUPL 1
+AGPLv3 4
+GPLv3/CCv3.0by 1
+New BSD 2
+LGPL 5
+Public Domain/Unlicense 1
+MPL 2
+Expat 1
+EPLv1 1
diff --git a/stats/repotypes.txt b/stats/repotypes.txt
index ae41751da7..a0bb30f9d2 100644
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@@ -1,7 +1,7 @@
-svn 54
+svn 56
 srclib 4
 none 40
-git 140
+git 153
 bzr 8
-git-svn 34
-hg 30
+git-svn 39
+hg 32
diff --git a/stats/total_downloads_app.txt b/stats/total_downloads_app.txt
index c173862880..70107c9185 100644
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt
@@ -1,267 +1,275 @@
 # Total downloads by application, since October 2011
-ALL 600613
-An.stop 2475
-aarddict.android 3675
-android.androidVNC 2995
-android.game.prboom 1116
-apps.droidnotify 1315
-arity.calculator 2564
-at.tomtasche.reader 503
-au.com.darkside.XServer 1292
-caldwell.ben.trolly 1774
+ALL 635214
+An.stop 2599
+aarddict.android 3860
+android.androidVNC 3178
+android.game.prboom 1192
+apps.droidnotify 1392
+arity.calculator 2731
+at.tomtasche.reader 540
+au.com.darkside.XServer 1406
+caldwell.ben.trolly 1847
 cm.aptoide.pt 88
-cmupdaterapp.ui 4317
-com.FireFart.Permissions 2225
-com.addi 2328
-com.agiro.scanner.android 490
-com.alfray.mandelbrot2 1470
-com.alfray.timeriffic 743
-com.andrewshu.android.reddit 1904
-com.android.inputmethod.norwegian 277
-com.android.keepass 3132
-com.androidemu.nes 305
-com.angrydoughnuts.android.alarmclock 3670
-com.anoshenko.android.mahjongg 1443
-com.appengine.paranoid_android.lost 1203
-com.ath0.rpn 493
-com.axelby.podax 1233
-com.beem.project.beem 2990
-com.boardgamegeek 1102
-com.bwx.bequick 2632
-com.bwx.qs.battery 2154
-com.chessclock.android 337
-com.ciarang.tallyphant 442
-com.commonsware.android.arXiv 1116
-com.csipsimple 2125
-com.danga.squeezer 357
-com.digitallizard.nicecompass 1368
-com.dozingcatsoftware.bouncy 3407
+cmupdaterapp.ui 4538
+com.FireFart.Permissions 2313
+com.addi 2488
+com.agiro.scanner.android 510
+com.alfray.asqare 1
+com.alfray.mandelbrot2 1539
+com.alfray.timeriffic 774
+com.andrewshu.android.reddit 1963
+com.android.inputmethod.norwegian 290
+com.android.keepass 3239
+com.androidemu.nes 462
+com.angrydoughnuts.android.alarmclock 3822
+com.anoshenko.android.mahjongg 1561
+com.appengine.paranoid_android.lost 1264
+com.ath0.rpn 528
+com.axelby.podax 1284
+com.beem.project.beem 3127
+com.boardgamegeek 1140
+com.bwx.bequick 2781
+com.bwx.qs.battery 2260
+com.chessclock.android 356
+com.ciarang.tallyphant 463
+com.commonsware.android.arXiv 1158
+com.csipsimple 2270
+com.danga.squeezer 370
+com.digitallizard.nicecompass 1464
+com.dozingcatsoftware.bouncy 3592
 com.drodin.tuxrider 26
-com.eddyspace.networkmonitor 1191
-com.eleybourn.bookcatalogue 1710
-com.episode6.android.appalarm.pro 165
-com.evancharlton.mileage 1246
-com.everysoft.autoanswer 495
-com.example.android.maxpapers 2158
-com.fsck.k9 9890
-com.funambol.androidsync 1416
-com.ghostsq.commander 6710
-com.google.android.diskusage 4513
+com.eddyspace.networkmonitor 1251
+com.eleybourn.bookcatalogue 1758
+com.episode6.android.appalarm.pro 166
+com.evancharlton.mileage 1289
+com.everysoft.autoanswer 525
+com.example.android.maxpapers 2271
+com.fsck.k9 10514
+com.funambol.androidsync 1469
+com.ghostsq.commander 7042
+com.glTron 1
+com.google.android.diskusage 4676
 com.google.android.maps.mytracks 554
-com.google.android.stardroid 300
-com.google.code.appsorganizer 2425
-com.google.zxing.client.android 9335
+com.google.android.stardroid 323
+com.google.code.appsorganizer 2531
+com.google.zxing.client.android 9785
 com.googlecode.androidcells 430
-com.googlecode.chartdroid 481
-com.googlecode.droidwall 4396
-com.googlecode.talkmyphone 694
-com.gpl.rpg.AndorsTrail 4769
-com.hermit.btreprap 121
-com.hughes.android.dictionary 2123
-com.ichi2.anki 2891
-com.ihunda.android.binauralbeat 2191
-com.jadn.cc 1427
-com.kirit.android.mintercept 2332
-com.kmagic.solitaire 3620
-com.kostmo.wallpaper.spiral 536
-com.lecz.android.tiltmazes 2373
-com.leinardi.kitchentimer 1694
-com.liato.bankdroid 504
-com.matburt.mobileorg 1727
-com.mobilepearls.sokoban 2423
-com.morphoss.acal 6920
-com.mp3tunes.android.player 115
-com.namelessdev.mpdroid 887
-com.nexes.manager 3097
-com.owncloud 747
-com.proch.practicehub 1449
-com.replica.replicaisland 2804
-com.ringdroid 1735
-com.roozen.SoundManager 1522
-com.scottmain.android.searchlight 1318
-com.seavenois.tetris 1540
-com.serone.desktoplabel 996
-com.showmehills 123
-com.smorgasbork.hotdeath 1470
-com.stericson.permissions 2602
-com.tastycactus.timesheet 731
-com.teleca.jamendo 2483
-com.textuality.lifesaver2 1031
-com.totsp.bookworm 952
-com.totsp.crossword.shortyz 442
-com.unitedcoders.android.gpodroid 690
-com.voidcode.diasporawebclient 1855
-com.volosyukivan 1624
-com.wanghaus.remembeer 194
-com.webworxshop.swallowcatcher 1151
-com.zapta.apps.maniana 1115
+com.googlecode.chartdroid 496
+com.googlecode.droidwall 4630
+com.googlecode.talkmyphone 713
+com.gpl.rpg.AndorsTrail 4977
+com.hermit.btreprap 141
+com.hughes.android.dictionary 2251
+com.ichi2.anki 3006
+com.ihunda.android.binauralbeat 2329
+com.jadn.cc 1489
+com.kirit.android.mintercept 2452
+com.kmagic.solitaire 3835
+com.kostmo.wallpaper.spiral 576
+com.lecz.android.tiltmazes 2480
+com.leinardi.kitchentimer 1799
+com.liato.bankdroid 534
+com.matburt.mobileorg 1800
+com.mobilepearls.sokoban 2552
+com.morphoss.acal 7405
+com.mp3tunes.android.player 121
+com.namelessdev.mpdroid 974
+com.nexes.manager 3244
+com.owncloud 892
+com.proch.practicehub 1519
+com.replica.replicaisland 2926
+com.ringdroid 1825
+com.roozen.SoundManager 1588
+com.scottmain.android.searchlight 1434
+com.seavenois.tetris 1717
+com.serone.desktoplabel 1031
+com.showmehills 169
+com.smorgasbork.hotdeath 1538
+com.stericson.permissions 2776
+com.tastycactus.timesheet 776
+com.teleca.jamendo 2594
+com.textuality.lifesaver2 1083
+com.totsp.bookworm 1007
+com.totsp.crossword.shortyz 475
+com.unitedcoders.android.gpodroid 730
+com.uploadedlobster.PwdHash 22
+com.voidcode.diasporawebclient 1932
+com.volosyukivan 1707
+com.wanghaus.remembeer 200
+com.webworxshop.swallowcatcher 1188
+com.zapta.apps.maniana 1210
 com.zegoggles.smssync 704
-cri.sanity 1025
-cx.hell.android.pdfview 3188
-cz.hejl.chesswalk 2435
-cz.romario.opensudoku 2122
-de.blau.android 277
-de.delusions.measure 612
-de.duenndns.gmdice 602
-de.fmaul.android.cmis 172
+cri.sanity 1112
+cx.hell.android.pdfview 3492
+cz.hejl.chesswalk 2565
+cz.romario.opensudoku 2243
+de.blau.android 320
+de.delusions.measure 673
+de.duenndns.gmdice 670
+de.fmaul.android.cmis 181
 de.joergjahnke.c64.android 32
-de.schildbach.wallet 480
-de.schildbach.wallet_test 111
-de.shandschuh.slightbackup 1563
-de.shandschuh.sparserss 4153
-de.ub0r.android.adBlock 3871
-dk.andsen.asqlitemanager 1808
-edu.killerud.kitchentimer 593
-edu.nyu.cs.omnidroid.app 1383
-edu.rit.poe.atomix 1928
-es.cesar.quitesleep 444
-es.prodevelop.gvsig.mini 1525
-eu.domob.angulo 51
-fm.libre.droid 1197
-fr.keuse.rightsalert 534
-fr.seeks 503
-goo.TeaTimer 1280
-in.shick.diode 99
-in.shick.lockpatterngenerator 121
-info.guardianproject.browser 1645
-info.guardianproject.cacert 952
-info.guardianproject.otr.app.im 1868
-info.lamatricexiste.network 5569
-info.staticfree.android.twentyfourhour 1323
-info.staticfree.android.units 3519
-jackpal.androidterm 1725
-kdk.android.simplydo 849
-li.klass.fhem 329
-me.guillaumin.android.osmtracker 2149
-mixedbit.speechtrainer 1020
-name.bagi.levente.pedometer 2082
-net.androgames.level 3102
-net.avs234 2036
-net.bytten.xkcdviewer 1925
-net.cactii.mathdoku 1222
-net.dahanne.android.regalandroid 502
-net.fercanet.LNM 2136
-net.gaast.giggity 495
-net.healeys.lexic 395
-net.iowaline.dotdash 678
-net.jaqpot.netcounter 2093
-net.mafro.android.wakeonlan 1426
-net.micode.compass 2973
-net.nightwhistler.pageturner 792
-net.osmand 2480
-net.osmand.plus 7745
-net.pierrox.mcompass 1956
-net.rocrail.androc 1674
-net.sf.andbatdog.batterydog 2583
-net.sourceforge.servestream 1191
-net.status.client.mobile 741
-net.sylvek.sharemyposition 916
-net.szym.barnacle 1470
-net.tapi.handynotes 3182
-net.tedstein.AndroSS 3617
-net.tevp.postcode 292
-nl.sogeti.android.gpstracker 1250
-no.rkkc.bysykkel 10
-nu.firetech.android.pactrack 111
-org.abrantix.rockon.rockonnggl 1301
-org.adaway 11770
-org.adw.launcher 3271
-org.ametro 1486
-org.andnav.osm 2303
-org.androidsoft.games.memory.kids 1617
-org.bc_bd.mrwhite 675
-org.beide.bomber 84
-org.birthdayadapter 796
-org.connectbot 4868
-org.coolreader 6956
-org.curiouscreature.android.shelves 470
-org.damazio.notifier 613
-org.dnaq.dialer2 969
-org.droidseries 1925
-org.eehouse.android.xw4 1973
-org.example.pushupbuddy 796
-org.fastergps 3195
-org.fdroid.fdroid 115914
+de.schildbach.wallet 516
+de.schildbach.wallet_test 122
+de.shandschuh.slightbackup 1642
+de.shandschuh.sparserss 4254
+de.ub0r.android.adBlock 4069
+dk.andsen.asqlitemanager 1898
+edu.killerud.kitchentimer 671
+edu.nyu.cs.omnidroid.app 1423
+edu.rit.poe.atomix 1998
+es.cesar.quitesleep 505
+es.prodevelop.gvsig.mini 1576
+eu.domob.anacam 234
+eu.domob.angulo 278
+fm.libre.droid 1259
+fr.keuse.rightsalert 628
+fr.seeks 530
+goo.TeaTimer 1338
+in.shick.diode 232
+in.shick.lockpatterngenerator 183
+info.guardianproject.browser 1748
+info.guardianproject.cacert 984
+info.guardianproject.otr.app.im 1996
+info.lamatricexiste.network 5810
+info.staticfree.android.twentyfourhour 1491
+info.staticfree.android.units 3660
+jackpal.androidterm 1891
+kdk.android.simplydo 933
+li.klass.fhem 355
+me.guillaumin.android.osmtracker 2249
+mixedbit.speechtrainer 1091
+name.bagi.levente.pedometer 2180
+net.androgames.level 3282
+net.avs234 2172
+net.bytten.xkcdviewer 2009
+net.cactii.mathdoku 1271
+net.dahanne.android.regalandroid 518
+net.fercanet.LNM 2217
+net.gaast.giggity 509
+net.healeys.lexic 428
+net.iowaline.dotdash 732
+net.jaqpot.netcounter 2178
+net.mafro.android.wakeonlan 1518
+net.micode.compass 3210
+net.nightwhistler.pageturner 838
+net.osmand 2601
+net.osmand.plus 8257
+net.pierrox.mcompass 2105
+net.rocrail.androc 1750
+net.sf.andbatdog.batterydog 2704
+net.sourceforge.servestream 1237
+net.status.client.mobile 772
+net.sylvek.sharemyposition 965
+net.szym.barnacle 1577
+net.tapi.handynotes 3346
+net.tedstein.AndroSS 3762
+net.tevp.postcode 299
+nl.sogeti.android.gpstracker 1277
+no.rkkc.bysykkel 20
+nu.firetech.android.pactrack 114
+org.abrantix.rockon.rockonnggl 1303
+org.adaway 12306
+org.adw.launcher 3480
+org.ametro 1601
+org.andnav.osm 2425
+org.androidsoft.games.memory.kids 1732
+org.bc_bd.mrwhite 761
+org.beide.bomber 437
+org.birthdayadapter 894
+org.connectbot 5101
+org.coolreader 7174
+org.curiouscreature.android.shelves 498
+org.damazio.notifier 635
+org.dnaq.dialer2 1035
+org.droidseries 1977
+org.eehouse.android.xw4 2044
+org.example.pushupbuddy 830
+org.fastergps 3421
+org.fdroid.fdroid 122748
 org.fdroid.taskstrid 24
-org.fosdem 478
-org.fox.ttrss 447
-org.geometerplus.zlibrary.ui.android 5598
-org.helllabs.android.xmp 689
-org.hermit.audalyzer 2352
-org.hermit.netscramble 1492
-org.hermit.tricorder 3553
-org.jessies.mathdroid 1960
-org.jfedor.frozenbubble 7062
-org.jmoyer.NotificationPlus 466
-org.johanhil.flygtider 127
-org.jsharkey.sky 1310
-org.jtb.alogcat 3227
-org.jtb.droidlife 2288
-org.jtb.httpmon 976
-org.kost.externalip 2030
-org.kreed.vanilla 3493
-org.liberty.android.fantastischmemo 620
-org.linphone 1550
-org.madore.android.unicodeMap 68
+org.fosdem 486
+org.fox.ttrss 487
+org.geometerplus.zlibrary.ui.android 5798
+org.helllabs.android.xmp 712
+org.hermit.audalyzer 2494
+org.hermit.netscramble 1557
+org.hermit.tricorder 3718
+org.jessies.mathdroid 2057
+org.jfedor.frozenbubble 7389
+org.jmoyer.NotificationPlus 490
+org.johanhil.flygtider 130
+org.jsharkey.sky 1405
+org.jtb.alogcat 3342
+org.jtb.droidlife 2408
+org.jtb.httpmon 1009
+org.kost.externalip 2114
+org.kreed.vanilla 3701
+org.liberty.android.fantastischmemo 676
+org.linphone 1706
+org.madore.android.unicodeMap 165
 org.mailboxer.saymyname 31
-org.marcus905.wifi.ace 2750
-org.mixare 1979
-org.moparisthebest.appbak 2236
-org.mozilla.firefox 19486
-org.mozilla.firefox_beta 1412
-org.mult.daap 957
-org.mustard.android 1939
-org.mythdroid 673
-org.navitproject.navit 1943
-org.nerdcircus.android.klaxon 204
-org.ntpsync 718
-org.openintents.filemanager 2288
+org.marcus905.wifi.ace 2846
+org.mixare 2005
+org.moparisthebest.appbak 2337
+org.mozilla.firefox 20518
+org.mozilla.firefox_beta 1540
+org.mult.daap 1017
+org.mustard.android 1998
+org.mythdroid 704
+org.navitproject.navit 2044
+org.nerdcircus.android.klaxon 211
+org.ntpsync 815
+org.opengpx 75
+org.openintents.filemanager 2494
 org.openintents.newsreader 5
-org.opensatnav 3612
-org.paulmach.textedit 4174
-org.penghuang.tools.rotationlock 1485
-org.piwik.mobile 328
-org.pocketworkstation.pckeyboard 5942
-org.scoutant.blokish 3482
-org.sipdroid.sipua 1425
-org.sixgun.ponyexpress 639
-org.sparkleshare.android 403
-org.swiftp 1434
-org.thialfihar.android.apg 2761
-org.thoughtcrime.securesms 1316
-org.tof 1513
-org.tomdroid 1274
-org.torproject.android 3056
-org.transdroid 1533
-org.ttrssreader 2262
-org.uaraven.e 1031
-org.vudroid 3605
-org.wahtod.wififixer 2568
-org.wikipedia 4804
-org.woltage.irssiconnectbot 71
-org.wordpress.android 1638
-org.xbmc.android.remote 1162
-org.xcsoar 323
-org.yaaic 1878
-org.yaxim.androidclient 2056
-org.zirco 5268
-paulscode.android.mupen64plus 799
-pl.magot.vetch.ancal 23
-pt.isec.tp.am 2455
-remuco.client.android 904
-ru.gelin.android.weather.notification 2183
-ru.qrck.quitetaskmanager 1413
-se.johanhil.clipboard 1157
-se.johanhil.duckduckgo 3183
-se.peterbjorkman.android.trafikinfo 172
-seanfoy.wherering 518
+org.opensatnav 3791
+org.paulmach.textedit 4385
+org.penghuang.tools.rotationlock 1579
+org.piwik.mobile 346
+org.pocketworkstation.pckeyboard 6490
+org.projectvoodoo.simplecarrieriqdetector 2
+org.pyload.android.client 44
+org.scoutant.blokish 3671
+org.sipdroid.sipua 1502
+org.sixgun.ponyexpress 654
+org.sparkleshare.android 420
+org.swiftp 1519
+org.thialfihar.android.apg 2918
+org.thoughtcrime.securesms 1417
+org.tof 1620
+org.tomdroid 1318
+org.torproject.android 3208
+org.transdroid 1630
+org.ttrssreader 2296
+org.uaraven.e 1143
+org.vudroid 3781
+org.wahtod.wififixer 2662
+org.wikipedia 5127
+org.wiktionary 109
+org.woltage.irssiconnectbot 125
+org.wordpress.android 1697
+org.xbmc.android.remote 1234
+org.xcsoar 349
+org.yaaic 1956
+org.yaxim.androidclient 2113
+org.zirco 5493
+paulscode.android.mupen64plus 903
+pl.magot.vetch.ancal 24
+pt.isec.tp.am 2643
+remuco.client.android 988
+ru.gelin.android.weather.notification 2317
+ru.qrck.quitetaskmanager 1534
+se.johanhil.clipboard 1221
+se.johanhil.duckduckgo 3363
+se.peterbjorkman.android.trafikinfo 174
+seanfoy.wherering 541
 stericson.busybox.donate 386
-tkj.android.homecontrol.mythmote 580
-to.networld.android.divedroid 440
-tuioDroid.impl 217
-uk.co.jarofgreen.JustADamnCompass 912
-urbanstew.RehearsalAssistant 1140
-us.bravender.android.dongsa 88
-us.lindanrandy.cidrcalculator 1203
-vu.de.urpool.quickdroid 1939
-wb.receiptspro 90
+tkj.android.homecontrol.mythmote 594
+to.networld.android.divedroid 461
+tuioDroid.impl 235
+uk.co.jarofgreen.JustADamnCompass 984
+urbanstew.RehearsalAssistant 1203
+us.bravender.android.dongsa 98
+us.lindanrandy.cidrcalculator 1254
+vu.de.urpool.quickdroid 2037
+wb.receiptspro 197