Added an AddLocations() method to Statement.
Removed unneeded casts from MergeTests.
Added java package merge test.
Added method definition merging and tests.
Added type definition merging and tests.
Changed the MethodCallSurvey tool to use PrimaryLocation instead of Location.