Merge pull request #311 from bhariharan/unstable20

Fix Build Issues with ADT 22.0
Move NativeSqlAggregator app into SampleApps folder and update .npmignore