updated (tested in local wifi)
Merge branch 'phonegap'

* phonegap:
  updated (tested in local wifi)