line endings
Merge branch 'develop' of https://github.com/secure-software-engineering/soot-infoflow-android into develop

Conflicts:
	ant.settings.template
	build.xml