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
UICatalog fix for 7.1
Merge pull request #2061 from sebv/uicatalog-fix

UICatalog fix for 7.1
added duplicate textfield test
appium-uiauto + appium-instruments upgrade
Merge pull request #2065 from sebv/dup-textfield

Package upgrade + duplicate test.
Android mobile push & pull

Ruby examples:

mobile :pushFile, data: Base64.encode64('test ruby'), path: '/data/local/tmp/test.txt'

pull_result = mobile :pullFile, path: '/data/local/tmp/test.txt'
Base64.decode64 pull_result
update appium-uiauto submodule so we can get fix (cc @sebv)
using npmlink -m in reset.sh sometimes puts submodules at an earlier commit than the one we want