fixed a problem in Soot that would cause "duplicate class" errors depending on class-loading order
Merge branch 'hotfix/classloading-problem'
fixing type annotation
Merge branch 'hotfix/fix'