* More Cordova infrastructure files.
Merge branch 'master' into csld