fix bad conflict resolution, include uiauto bootstrap when launching instruments
Merge pull request #1995 from jlipps/master

fix bad conflict resolution, include uiauto bootstrap when launching ins...
added java example code for scrollTo action.
Merge pull request #1998 from danubiusdan/patch-1

added java example code for scrollTo action.
Added support for --udid to the reset scripts.
commit docs only
Merge pull request #2006 from testerhome/master

finish all docs translation work except style guide doc
Spelling alterations
Windows support is no longer beta
Ignore maven/surefire byproducts
Merge pull request #2008 from imurchie/isaac-gitignore

Ignore maven/surefire byproducts
fixed custom mocha args
Merge pull request #2009 from Jonahss/windowsTestFix

fixed custom mocha args
don't delete /Applications unless we're doing fullRest, and add tests of safariIgnoreFraudWarning in safari itself
Merge pull request #2012 from jlipps/master

don't delete /Applications unless we're doing fullReset
Merge pull request #2000 from paymand/reset_udid

Added support for --udid to the reset scripts.
Added support for touch{Down|Up|Move} on Android.
Clean up debug logging
Merge pull request #2007 from paymand/down_up_move

Added support for touch{Down|Up|Move} on Android.
Add license to package.json