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
Select Simulator Device & SDK

* use deviceName + version caps to launch a particular simulator device and SDK version (6.1, 7.0.3, 7.1)
* update appium-instruments submodule with corresponding change
* fail if the user tries to set preferences or language/locale and full-reset is requested since they don't work together

Fix #2032, #1642, #304
Merge pull request #2066 from bootstraponline/android_push

Android mobile push & pull
make sure we can do forceiPad and safari
heads up @DylanLacey, this will likely cause a conflict with your work
change safari webview xpath so it works on 7.1 ipad as well
Merge pull request #2068 from jlipps/master

change safari webview xpath so it works on 7.1 ipad as well
Merge pull request #2060 from dandoveralba/51support

Select Simulator Device & SDK
Fix reset & setPreferences interop

*  restore reset to it's previous state for mobile/hybrid apps and preserve new approach for safari so it's app plist can be set
Merge pull request #2069 from dandoveralba/fix-locale

Update reset & setPreferences interop
Fix reset & setLocServicesPrefs interop

* same approach as with Safari prefs