Cordova 2.6.0

Note: please only pull this _after_ the 'merge_demo_project' branch is merged.