Change name of capabilities method for sauce_example.rb to prevent us trampling a protected method
Merge pull request #1354 from DylanLacey/master

Don't monkey-patch "capabilities" as this is now apparently a defined method
copy status and xpath to uiauto instead of linking
so they get picked up appropriately by npm
Don't set Content-Length header for http POSTs with empty body.
(Android) Correct handling of 'element{Displayed|Enabled|Selected}'.
Merge pull request #1358 from jlipps/master

copy status/xpath instead of linking
Merge pull request #1357 from paymand/element_methods

Element methods
add some more caps to docs
Small typo fixes in docs and expanded on android setup for mac osx
Merge pull request #1360 from filmaj/android-docs

Expanded Android docs
Fixed missing callback parameter
Merge pull request #1370 from bicycleio/master

Missing callback parameter causing Appium to crash
fix for #1040
remove confusing multiple session handling code
it doesn't actually do anything and was cruft
also, make session overriding non-default based on the mobile
JSONWP discussions
check in midway through android startup/shutdown refactor
finish making shutdown() callback-based
command timeouts should be handled centrally by appium, not by each device
when we get an error starting up an android test, make sure we kill uiautomator
so it doesn't complain next time we run a test
Merge pull request #1371 from drpy/master

fix for #1040
Merge pull request #1372 from jlipps/master

Cleanup/refactor of appium/android startup/shutdown