Merge pull request #21 from dhuyvett/phonegap-2.x.x

Phonegap 2.x.x