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