Package consuming 2.0.1 SDK updates
Merge pull request #21 from khawkins/201_update

Package consuming 2.0.1 SDK updates
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	HybridShared
Merge pull request #22 from khawkins/unstable

Package: merging master into unstable