Merge branch 'develop' of ssh://github.com/secure-software-engineering/soot-infoflow into develop

Conflicts:
	src/main/java/soot/jimple/infoflow/taintWrappers/EasyTaintWrapper.java