Normalize line endings as per https://help.github.com/articles/dealing-with-line-endings
Merge branch 'develop' of ssh://github.com/secure-software-engineering/soot-infoflow into develop

Conflicts:
	build.xml
	src/soot/jimple/infoflow/AbstractInfoflowProblem.java
	src/soot/jimple/infoflow/BackwardsInfoflowProblem.java
	src/soot/jimple/infoflow/heros/InfoflowSolver.java
Merge branch 'develop' of https://github.com/malaverdiere/soot-infoflow into develop
fixed reset to null