Merge remote-tracking branch 'mjb/master'

diff --cc altosdroid/Makefile.am
index cc74b7a85395b817e653792cdaec4d048ebe9cd0,3b5abfc4c3dde1884e59121c6f3e4e133bb2c309..39f3c2b6a48439d82a08811c012ea778fa2f99d8
--- 1/altosdroid/Makefile.am
--- 2/altosdroid/Makefile.am
+++ b/altosdroid/Makefile.am
@@@ -54,12 -54,18 +54,21 @@@ bin/AltosDroid-debug.apk: $(SRC) $(ALTO
  
  bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB)
        ant release
+ 
+ sign:
+       jarsigner -keystore release.keystore \
+          -signedjar bin/AltosDroid-release-signed.apk \
+          bin/AltosDroid-release-unsigned.apk AltosDroid
+       $(SDK)/tools/zipalign -f 4 \
+          bin/AltosDroid-release-signed.apk \
+          bin/AltosDroid-release.apk
+ 
  endif
  
 -clean:
 +clean: clean-local
        $(clean_command)
  
 +clean-local:
 +      rm -rf $(EXT_LIBDIR)
 +
  .PHONY: $(SRC_DIR)/BuildInfo.java

diff --cc altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
Simple merge