Merge branch 'master' into 'master'

Fix Barcode Scanner v4.7.0 & OctoDroid 3.6. Update GnuCash & OWMap/Mini

Barcode scanner
===============
* Revert commit: "Barcode Scanner: also build android-core, use maven"
This change was done for v4.6.4, although it didn't have any java files under android-core yet. Also this
change did not build v4.7.0 for me

* Append android-core to source.dir

OctoDroid
=========
Based on @agilob's commit: 3ade25766c

Patched out BugSense

metadata/com.gh4a.txt

@@ -30,16 +30,13 @@ so updates are unlikely here.
 Repo Type:git
 Repo:https://github.com/slapperwan/gh4a.git
 
-Build:3.2,32
-    commit=5149069ae5
-    srclibs=ActionBarSherlock@9598f2bb2c,ViewPagerIndicator@65457eac06
-    prebuild=sed -i '/Pager/d' project.properties && \
-        sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-        echo "android.library.reference.2=$$ViewPagerIndicator$$" >> project.properties && \
-        rm -rf libs/android-support-v4.jar
+Build:3.6,36
+    commit=53d2e5bbfd76d8ad4a779913df7b3f193fb19a3e
+    prebuild=rm -rf libs/android-support-v4.jar
+    patch=bugsense.patch
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:3.2
-Current Version Code:32
-
+Current Version:3.6
+Current Version Code:36

metadata/com.gh4a/bugsense.patch

@@ -0,0 +1,40 @@
+diff --git a/build.gradle b/build.gradle
+index 5150e12..6cd42b1 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -10,7 +10,6 @@ buildscript {
+ 
+ repositories {
+     maven { url 'http://dl.bintray.com/populov/maven' }
+-    maven { url "http://www.bugsense.com/gradle/" }
+     maven { url 'https://github.com/kageiit/maven-repo/raw/master' }
+     mavenCentral()
+ }
+@@ -50,7 +49,6 @@ android {
+ dependencies {
+     compile fileTree(dir: 'libs', include: '*.jar')
+ 
+-    compile "com.bugsense.trace:bugsense:3.6"
+     compile 'com.android.support:support-v4:19.+'
+     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+     compile 'com.viewpagerindicator:library:2.4.1@aar'
+diff --git a/src/com/gh4a/Gh4Application.java b/src/com/gh4a/Gh4Application.java
+index 0e894d6..f56a934 100644
+--- a/src/com/gh4a/Gh4Application.java
++++ b/src/com/gh4a/Gh4Application.java
+@@ -47,7 +47,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+ import android.content.res.Configuration;
+ import android.graphics.Typeface;
+ 
+-import com.bugsense.trace.BugSenseHandler;
+ import com.gh4a.activities.Github4AndroidActivity;
+ 
+ /**
+@@ -99,7 +98,6 @@ public class Gh4Application extends Application implements OnSharedPreferenceCha
+         selectTheme(prefs.getInt("theme", Constants.Theme.DARK));
+         prefs.registerOnSharedPreferenceChangeListener(this);
+ 
+-        BugSenseHandler.initAndStartSession(this, "1e6a83ae");
+ 
+         mPt = new PrettyTime();
+ 

metadata/com.google.zxing.client.android.txt

@@ -84,15 +84,16 @@ Build:4.6.3,98
 Build:4.6.4,99
     commit=BS-4.6.4
     subdir=android
-    maven=yes
-    build=$$MVN3$$ package -f ../core/pom.xml && \
-        $$MVN3$$ package -f ../android-core/pom.xml
+    target=android-19
+    prebuild=echo -e "java.source=7\njava.target=7" >> local.properties
+    build=$$MVN3$$ package -f ../core/pom.xml
 
 Build:4.7.0,100
     commit=BS-4.7.0
     subdir=android
     target=android-19
-    prebuild=echo -e "java.source=7\njava.target=7" >> local.properties
+    prebuild=echo -e "java.source=7\njava.target=7" >> local.properties && \
+             echo 'source.dir=src;../android-core/src' >> project.properties
     build=$$MVN3$$ package -f ../core/pom.xml
 
 Auto Update Mode:Version BS-%v

metadata/com.vwp.owmap.txt

@@ -63,6 +63,11 @@ Build:1.10,110
     subdir=master/android/OWMapAtAndroid
     prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
 
+Build:1.11,111
+    commit=d2a864
+    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.11

metadata/com.vwp.owmini.txt

@@ -49,6 +49,11 @@ Build:1.10,110
     subdir=master/android/OWMiniAtAndroid
     prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
 
+Build:1.11,111
+    commit=d2a864
+    subdir=master/android/OWMiniAtAndroid
+    prebuild=echo 'source.dir=src;../LocDemo/src/com/vwp/libwlocate' > ant.properties
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:1.11

metadata/org.gnucash.android.txt

@@ -85,6 +85,11 @@ Build:1.3.2,28
     subdir=app
     srclibs=1:ActionBarSherlock@4.4.0,2:ViewPagerIndicator@2.4.1
 
+Build:1.3.3,29
+    commit=v1.3.3
+    subdir=app
+    srclibs=1:ActionBarSherlock@4.4.0,2:ViewPagerIndicator@2.4.1
+
 Auto Update Mode:None
 Update Check Mode:Tags v[0-9.]*$
 Current Version:1.3.3