Merge branch 'master' of github.com:calvinl/ng-phonegap