Merge pull request #51 from khawkins/unstable

Mobile SDK Package: Merging master into unstable
Updating package version to 2.1.2
Merge pull request #52 from khawkins/master

Updating package version to 2.1.2
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	package.json