[CB-2896] split writing of working tags off here, multipart tags not supported
Merge remote-tracking branch 'apache/master'
CB-2725: Fix www deploy issues with symlinks

- Fixes issue when 'www' is a symlink
- Fixes issue with symlinks when deploying to an actual device
[CB-2848] ShowSplashScreenSpinner not used
[CB-2896] fixed error in exif subifd offset calculation for tag 8769
[CB-2849] Fix bin/create when CordovaLib parent dir has a space
Merge remote-tracking branch 'apache/master'
[CB-2902] re-added long/short tags to template dict, fixed subExifIFD offset
[CB-2732] Only set camera device when allowed.

The camera device can only be set when the source type is
UIImagePickerControllerSourceTypeCamera (ie. we're actually using the
camera).

This is an intentional redux of
8d285676fcab25da70918d27d3b37210909d3e46.

There's also some uncrustification in here.
Updated VERSION to 2.6.0
Updated cordova.js to 2.6.0
[CB-2653] Delay executeScript/insertCSS callback until resources have loaded; pass JS results to callback
[CB-2824] Remove DebugConsole plugin

This is being replaced with the Logger plugin; see the associated commit in
cordova-dev
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [CB-2824] Remove DebugConsole plugin
  [CB-2653] Delay executeScript/insertCSS callback until resources have loaded; pass JS results to callback
  Updated cordova.js to 2.6.0
  Updated VERSION to 2.6.0
  [CB-2732] Only set camera device when allowed.
  [CB-2902] re-added long/short tags to template dict, fixed subExifIFD offset
  [CB-2849] Fix bin/create when CordovaLib parent dir has a space
  [CB-2896] fixed error in exif subifd offset calculation for tag 8769
  [CB-2848] ShowSplashScreenSpinner not used
  CB-2725: Fix www deploy issues with symlinks
  [CB-2896] split writing of working tags off here, multipart tags not supported