Merge branch 'hotfix/fix-for-method-resolution'
Adding links to the jasmin and heros github projects.
Merge pull request #67 from jbranchaud/master

Adding links to the README for the jasmin and heros repositories.
added override annotations
Merge branch 'develop' of github.com:Sable/soot into develop
added type information
removed an assertion which is not valid in all cases
added the team project file
fixed team-project file: use "develop" branch of jasmine as well
Merge branch 'master' of github.com:Sable/soot into develop
Merge branch 'develop' of github.com:Sable/soot into develop
toDex: Limit the number of registers for immediate constants
added some exclusions for those working with the IntelliJ IDE
Copy propagation now also supports cases in which a local has multiple equivalent constant-valued definitions
Merge branch 'develop' of github.com:Sable/soot into develop

Conflicts:
	.gitignore