update phonegap version
merge changes from bugfixes