Merge pull request #605 from wmathurin/unstable23

Settings bundle and image assets in shared/resources (instead of having a copy per project)
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
Exposing user switcher plugin, changing hybrid project to not expose 64-bit support
Merge pull request #610 from khawkins/hybrid_template_update

Exposing user switcher plugin, changing hybrid project to not expose 64-bit support
Merge remote-tracking branch 'upstream/unstable' into unstable23_merge

Conflicts:
	build/app_template_files/__HybridTemplateAppFiles__/__HybridTemplateAppName__.xcodeproj/project.pbxproj
Merge pull request #611 from khawkins/unstable23_merge

Mobile SDK: Merging unstable to unstable23