Merge pull request #312 from bhariharan/unstable20

Move NativeSqlAggregator app into SampleApps folder and update .npmignore
Fix Build Issues with ADT 22
Merge pull request #314 from bhariharan/master

Fix Build Issues with ADT 22
Merge branch 'master' into unstable20