Merge from unstable (move to final cordova 2.3 + misc fixes)