Resolved conflicts while merging from master to dev
Merge branch 'dev' of github.com:Azure/azure-sdk-for-node into dev
Updated changelog.txt and package.json files
enabling xplat cli test run for node sdk
updated versions in the grunt file
Merge pull request #1358 from amarzavery/release-0.10.2

Updated changelog.txt and package.json files