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