make android manifest xml src part of build/
make the change simpler, just include the file in npm
Merge pull request #664 from jlipps/master

put manifest src in build/
Use correct link for Android Prep within the readme

'Prepare your app for an Android test' was linking to an iOS section, this commit makes the link point to the Android section.
Merge pull request #666 from umaar/patch-1

Use correct link for Android Prep within the readme
Clean up functional tests for alert detection removing the need for
the telnetclient package.

Style change
Merge pull request #669 from mutualmobile/websocket_notifications_unittests_cleanup

Clean up functional tests for alert detection removing the need for
add getLocation for android
make exception check broader
Merge pull request #672 from jlipps/master

getLocation for android
WebView is not a widget
Merge pull request #679 from bootstraponline/fix_webview

WebView is not a widget
additional description hybrid.md

added some additional description around turning on the web inspector and updated the note on the bugfix (as a fix was done for the proxy)
Merge pull request #680 from snevesbarros/patch-1

additional description hybrid.md
make sure to escape sendKeys values properly
add note about hw.battery to android setup (fix #665)
update tests to be a bit more robust
use spinWaits to make sure these tests pass
make sure reset.sh is not in npm since it won't work anyways
changelog and bump to 0.6.1 for npm publish