Merge pull request #27 from onkar-dhuri/2.2

Included custom test classes as part of ant build process.
Fixed the issue with package name for complex type of entities
Merge pull request #30 from shantanud/2.2

Fixed the issue with package name for complex type of entities
Merge remote-tracking branch 'upstream/2.2' into 2.2