Merged changes from phonegap-demo to phonegap-build