Fix for #1364
Merge pull request #1378 from drpy/master

Fix for #1364 (unable to build unlock_apk on Windows)
fail with an error message if user is on xcode 5.0.1 (address #1377)
Merge pull request #1379 from jlipps/master

fail with an error message if user is on xcode 5.0.1 (address #1377)
changelog and bump to 0.11.1 for publish
add logging initialization in bin/appium so npm will work (fix #1381)
changelog and bump to 0.11.2 for publish
changelog and update reset.sh to fix --real-safari bug
Added support for both simulator and physical devices when using safari launcher. It now automatically connects to first web view and leave's web view at the end of the test.
Merge pull request #1339 from snevesbarros/safari_launcher_simulator

Safari launcher integration with simulator and physical devices
refactor ios startup cascade
log if we can't delete a tracedir
make sure examples link doesn't point to node examples but to all
remove references to appium wiki
add selendroid test writing docs and link to running-tests doc from README
update caps and formatting
use javascript rendering for json
fix tracetemplate detection logic and logging (fix #1386)
Merge pull request #1387 from jlipps/master

fix tracetemplate detection logic and logging (fix #1386)
fix appium device end callback logic (fix #1389)