fix potential null pointer
Merge branch 'master' of github.com:calabash/calabash-android
prevent potential index out of bounds
added apktool
bump robotium and NanoHTTPD
Use jackson as jar
Merge branch 'master' of https://github.com/calabash/calabash-android

Conflicts:
	ruby-gem/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java