Updating npm project files
Merge pull request #608 from khawkins/npm_updates

Updating npm project files
Merge remote-tracking branch 'upstream/unstable' into unstable23_merge

Conflicts:
	build/app_template_files/__HybridTemplateAppFiles__/__HybridTemplateAppName__.xcodeproj/project.pbxproj
	build/app_template_files/__HybridTemplateAppFiles__/__HybridTemplateAppName__/Classes/AppDelegate.m
Merge pull request #609 from khawkins/unstable23_merge

Mobile SDK: Merging unstable to unstable23