Making sure cwd is appium install dir
Update troubleshooting.md
Merge pull request #2043 from sebv/cwd

Making sure cwd is consistent
Merge pull request #2046 from Javier84/patch-1

Update troubleshooting.md
Default to mercy on iOS
Merge pull request #2048 from bootstraponline/ios_mercy

Default to mercy on iOS
point out that locationServicesEnabled cap requires bundleId
ensure we get a decent error message if someone uses locationServicesAuthorized with no bundleId
Merge pull request #2052 from jlipps/master

add locationServicesAuthorized errors/warnings when there's no bundleId
actually clear out commandTimeout in between sessions so we don't start the timer while a new session is loading the app
add some logging to make it easier to follow ios startup flow
Remove Extra CB

* remove extra callback...

Fix #2044
Merge pull request #2054 from dandoveralba/fixcb

Remove Extra CB
fixed find-element tests for ios7
added better error reporting to test helper
Merge pull request #2059 from Jonahss/fixFindTest

Fix find-element tests for ios7