upgrades to testing libraries
Merge branch 'master' of github.com:jayway/maven-android-plugin