Merge pull request #1410 from jlipps/master

make sure command timeout is reset for proxied devices too (fix #1404)
add chinese docs
Added bundleId for simulator build and did a cleanup for isSafariLauncherApp flag
Merge pull request #1365 from testerhome/master

Translate Appium Docs to Chinese
Merge pull request #1414 from snevesbarros/fix_1411_null_session

fix for 1411: added bundleId to sim build and did safariLauncher flag cleanup
Update hybrid.md
Merge pull request #1417 from feelobot/patch-3

Update hybrid.md
Support for iOS logs for devices and simulators

Fix after comments by @jlipps

Fix require section
Merge pull request #1413 from ecomrobotics/ios-logs

Support for iOS logs for devices and simulators
Bugfixes for desired_capabilities updating and for ios_logging
Merge pull request #1424 from ecomrobotics/fix-updating-desired-capabilities

Bugfixes for desired_capabilities updating and for ios_logging
increase launch timeout for slow android emus