updated master to latest cordovajs master