phonegap buildserver build fixed
Merge branch 'origin/dev'