Reverting gitmodules to temp repo, submodule pointer updates
Merge pull request #47 from khawkins/unstable

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

Updating unstable package version to 2.2.0
Merge branch 'master' into unstable

Conflicts:
	HybridShared
Merge branch 'master' into unstable
Updating HybridShared pointer
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	Dependencies
	package.json
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
Merge pull request #53 from khawkins/unstable

Mobile SDK Package: Merging master into unstable
forceios 2.1.3
Merge pull request #55 from khawkins/213_update

forceios 2.1.3
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	Dependencies
	package.json
Merge pull request #56 from khawkins/unstable

Mobile SDK Package: Merging master into unstable
Updating Dependencies submodule
Merge pull request #57 from khawkins/master

Updating Dependencies submodule
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	Dependencies