Merge branch 'some-bug-fixes' into 'master'

Some bug fixes and things

A couple of useful bug fixes and commits.

See merge request !28

diff --cc jenkins-build
index 6e50b663e420bd9e362035c40ce2e2ab077dc3a8,f67c5ed02e45c11d074d0351dc06a09e97e37eab..8a7ca9bdfa10c15a503e5e6338062ccc0037c797
--- 1/jenkins-build
--- 2/jenkins-build
+++ b/jenkins-build
@@@ -38,11 -38,16 +38,11 @@@ f
  
  export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
  
 -#------------------------------------------------------------------------------#
 -# run local build
 -cd $WORKSPACE/fdroidserver/getsig
 -./make.sh
 -
  
  #------------------------------------------------------------------------------#
- # run local tests
+ # run local tests, don't scan fdroidserver/ project for APKs
  cd $WORKSPACE/tests
- ./run-tests ~jenkins/
+ ./run-tests ~jenkins/workspace/[[:upper:]a-eg-z]\*
  
  
  #------------------------------------------------------------------------------#