Merge pull request #1 from phonegap/master

Merge with main
a minor debugging version
added iPhone 6
Merged with phone-gap and fixed the hang
Fixed two issues:
1. When the device is locked, the python source prints and exists. The
server sees this as an empty packet. We are using this to exit out of
the connection
2. When we use just launch, we need to do safequit and detach. Otherwise
we hang for ever
Allow the symbols and the disk images to be in different DeviceSupport directories.
Fix for mismatched build numbers.
Merge branch 'disk-image-fix' of https://github.com/eddieh/ios-deploy

Conflicts:
	ios-deploy.c
updated the version
fixed the lauch using python