fix deploy script errors
fix PhoneGap file upload error
Merge pull request #5 from mark-monteiro/staging

Merge Staging with Master