sync unstable with master.

Phonegap demo was added to the master branch