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
Fixed problem with the parser of the value of the parameter -i.
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
updated the version to 1.3.0
Allow timeout for download and run
Removed the wrong comment
Merge pull request #68 from senthilmanick/master

Fixed the hang when the device is locked.

When the device is locked, we get empty packets in the server.
Now fixed by closing both the lldb and server sockets.
Also after safequit, we need to detach to make the "justlaunch" option to be less error prone.

Multiple bug fixes: 
1. When multiple devices are connected, the detect was not listing all the devices ios-deploy -c -t 1
2. Fixes for issue #75 - non-interactive mode broken lldb and ios-deploy may still be running ios-deploy -b ... -d -I -L
3. Fixes for issue #60 - -L option not working properly ios-deploy will not quit or sometimes hang
4. When multiple devices are connected, cannot use -i option to specify the device ios-deploy -b ... -i -d -I -L
5. Allow timeout when downloading
Merge pull request #72 from CSOscarTanner/master

Fixed problem with the parser of the value of the parameter -i.
Fixes phonegap/ios-deploy#37 - AMDeviceValidatePairing fails when uninstalling
Fixes phonegap/ios-deploy#74 - SIGSEGV-ed while listing the sandbox of an application on iOS8
Update package.json version to 1.3.0
Removed unused gdbargs and gdbexec options.