phonegap addons
Merge branch 'dev'