UPDATE: move literal values to constants and referenced from getters (so they could be changed in subsequent projects)

Currently the "bootstrap.html" and "www" folders are referenced by literals in private methods.

By moving those literals to constants and then referencing those values through getters, they could be changed in other projects with minimal impact.
Adding support for incompatible connected app versions
Merge pull request #208 from khawkins/connected_app_version_error

Adding support for incompatible connected app versions
FIX: use the getter instead of the literal for the www folder.
Merge remote-tracking branch 'upstream/master' into connected_app_version_updates

NB: Initial merge of master into unstable.  More changes to come.

Conflicts:
	dist/SalesforceOAuth/SalesforceOAuth-Debug.zip
	dist/SalesforceOAuth/SalesforceOAuth-Release.zip
	dist/SalesforceSDK/SalesforceSDK-Debug.zip
	dist/SalesforceSDK/SalesforceSDK-Release.zip
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/NativeApp/SFNativeRestAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m
Interim checkin
Localizing OAuth strings, reorg of other l12n
Commiting binary changes, making SFSDKResourceUtils public
Merge remote-tracking branch 'paulroth3d/master' into paulroth_updates
Updating SDK patch version, fixing typo.
Merge pull request #210 from khawkins/connected_app_version_updates

Connected app updates (master -> unstable and more)
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m
Adding new resource utils class to test target
Prevent iOS from saving snapshot of app state
Move common function out to be shared between hybrid and native
Refactoring and adding new binaries
Merge pull request #213 from bhariharan/screenshot

Prevent iOS from saving a snapshot of the app state
Normalizing auth flow between native and hybrid.
Updating native libraries after merge
Merge pull request #215 from khawkins/connected_app_version_updates

Normalizing auth flow between native and hybrid.