added a self-contained version for the PLDI'14 artifact evaluation
Merge branch 'develop' of github.com:secure-software-engineering/soot-infoflow-android into develop
Merge branch 'develop' of github.com:secure-software-engineering/soot-infoflow-android into unstable
added test timeouts