Merge pull request #1190 from prolificcoder/master

increasing instruments timeout
Update hybrid.md

Added ruby syntax
Merge pull request #1193 from feelobot/patch-1

Update hybrid.md
Fixes from code review on #1161
Merge pull request #1202 from penguinho/udidetect

Fixes from code review on #1161
Updated troubleshooting.md on webview iOS real-device debugging

Feel free to ignore this pull request and instead expand docs on what's now required to debug Webviews on real devices. You can get the gist of it from the discussion by the end, but it's not all that straightforward.
Merge pull request #1203 from LouisStAmour/patch-1

Updated troubleshooting.md on webview iOS real-device debugging
Merge branch 'master' of github.com:appium/appium into patch-2

Conflicts:
	docs/hybrid.md