mobile: localScreenshot
Merge pull request #1016 from bootstraponline/mobile_proxy

mobile: localScreenshot
fixed issue around installation where app was downloaded and unzipped twice for the installApp mobile command.
Fix "Cannot read property of null/undefined".
Merge pull request #1026 from TadeasKriz/fix/undefined-this

Fix "Cannot read property of null/undefined".
Added longer timeout for http_client

To compensate for slower boot time of Android VMs and for network issues, wait longer before timing out (but only at startup).
Added fix to remove app/apk files from zipPath before appium starts to unzip them. If this is *.app located in Payload folder then folder is being removed too. Fix is done because fruitstrap sometimes failes to install app file on the device when /var/folders/... are not cleared correctly.
Merge pull request #1030 from tborys/remove_unziped_files

Remove *.app/*.apk/ file and Payload folder before appium starts to unzip file.
Merge pull request #1025 from snevesbarros/installApp_fix

Update and fix to installApp mobile command
updates device list to be an array of objects, instead of an array of arrays
adds first round of modifications to get multiple real android devices using appium
finishes modifications for parallel testing on multiple android devices connected to the same machine
adds the modified server args doc
Merge pull request #1034 from DylanLacey/master

Added longer timeout for http_client
Merge pull request #1033 from rockbot/multiple-android-parallel

multiple real android devices running separate tests in parallel
updates server arg docs to indicate device port is android only
Merge pull request #1035 from rockbot/multiple-android-parallel

updates server arg docs to indicate device port is android only
reset.sh no longer matches against tab character to parse output from adb.
Use Selenium built in wait methods
Fix real device docs