[CB-2896] fixed error in exif subifd offset calculation for tag 8769
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
[CB-2725] follow links in www copy script

- finds nested symlinks directories and files
[CB-2960] Changing the volume of a sound already playing
[CB-3021] Can no longer import CDVPlugin.h from plugin Objective-C++ code
Interim .js for the deleted 'Debug Console' plugin