cleaned up the code
fixed a type conversion issue with Dalvik annotations
Merge branch 'develop' of github.com:Sable/soot into develop