Merge pull request #315 from bhariharan/unstable20

Merge branch 'master' into unstable20
More Fixes for ADT 22 to Prevent NoClassDefFoundError
Merge pull request #316 from bhariharan/master

More Fixes for ADT 22 to Prevent NoClassDefFoundError
Merge branch 'master' into unstable20