Pointing to dependencies # cordova34
Pointing to shared on wmathurin
Pointing to shared # cordova34
Latest AppDelegate.m
Merge from unstable
Chaning forceios.js to use cordova when creating an hybrid app
Removing hybrid templates and sample apps
Merging in latest unstable
Merge pull request #66 from wmathurin/unstable

iOS-Package with 2.3 changes
Updating Dependencies with latest build
Merge pull request #67 from khawkins/update_deps

Updating Dependencies with latest build
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	Dependencies
	Samples/hybrid/AccountEditor/AccountEditor.xcodeproj/project.pbxproj
	Samples/hybrid/AccountEditor/AccountEditor/AccountEditor-Info.plist
	Samples/hybrid/AccountEditor/AccountEditor/Classes/AppDelegate.h
	Samples/hybrid/AccountEditor/AccountEditor/Classes/AppDelegate.m
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default-Portrait~ipad.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default.png
	Samples/hybrid/AccountEditor/AccountEditor/Images.xcassets/LaunchImage.launchimage/Default@2x.png
	Samples/hybrid/AccountEditor/AccountEditor/main.m
	Samples/hybrid/ContactExplorer/ContactExplorer.xcodeproj/project.pbxproj
	Samples/hybrid/ContactExplorer/ContactExplorer/Classes/AppDelegate.h
	Samples/hybrid/ContactExplorer/ContactExplorer/Classes/AppDelegate.m
	Samples/hybrid/ContactExplorer/ContactExplorer/ContactExplorer-Info.plist
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default-Landscape@2x~ipad.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default-Portrait@2x~ipad.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default-Portrait~ipad.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default.png
	Samples/hybrid/ContactExplorer/ContactExplorer/Images.xcassets/LaunchImage.launchimage/Default@2x.png
	Samples/hybrid/ContactExplorer/ContactExplorer/main.m
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer.xcodeproj/project.pbxproj
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Classes/AppDelegate.h
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Classes/AppDelegate.m
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/HybridFileExplorer-Info.plist
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Images.xcassets/LaunchImage.launchimage/Default.png
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/Images.xcassets/LaunchImage.launchimage/Default@2x.png
	Samples/hybrid/HybridFileExplorer/HybridFileExplorer/main.m
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer.xcodeproj/project.pbxproj
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Classes/AppDelegate.h
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Classes/AppDelegate.m
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Images.xcassets/LaunchImage.launchimage/Default.png
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/Images.xcassets/LaunchImage.launchimage/Default@2x.png
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/SmartStoreExplorer-Info.plist
	Samples/hybrid/SmartStoreExplorer/SmartStoreExplorer/main.m
	Samples/hybrid/VFConnector/VFConnector.xcodeproj/project.pbxproj
	Samples/hybrid/VFConnector/VFConnector/Classes/AppDelegate.h
	Samples/hybrid/VFConnector/VFConnector/Classes/AppDelegate.m
	Samples/hybrid/VFConnector/VFConnector/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
	Samples/hybrid/VFConnector/VFConnector/Images.xcassets/LaunchImage.launchimage/Default-Landscape~ipad.png
	Samples/hybrid/VFConnector/VFConnector/Images.xcassets/LaunchImage.launchimage/Default.png
	Samples/hybrid/VFConnector/VFConnector/Images.xcassets/LaunchImage.launchimage/Default@2x.png
	Samples/hybrid/VFConnector/VFConnector/VFConnector-Info.plist
	Samples/hybrid/VFConnector/VFConnector/main.m
	Templates/HybridAppTemplate/__HybridTemplateAppName__/__HybridTemplateAppName__.xcodeproj/project.pbxproj
	Templates/HybridAppTemplate/__HybridTemplateAppName__/__HybridTemplateAppName__/Classes/AppDelegate.m
	forceios.js
Fixing syntax error
Merge pull request #68 from khawkins/unstable_merge

Mobile SDK Package: Merging master to unstable
Fixing up some of the hybrid app creation
Added Cordova CLI min version checking
Merge pull request #69 from khawkins/hybrid_updates

Fixing up some of the hybrid app creation
Consuming new cordovaHelper module
Merge pull request #70 from khawkins/cordova_helper

Consuming new cordovaHelper module
Adding 'cordova prepare' statement to deploy bootconfig.json