add timeout for get
Merge pull request #500 from calabash/runGetUrlOnViewThread

add timeout for get
Bump version to 0.5.5.pre2
Fix NPE in CalabashChromeClient
Merge pull request #501 from calabash/fix/npe-in-calabash-chrome-client

Fix NPE in CalabashChromeClient
Bump version to 0.5.5.pre3
Replaced all robotium solo usages by espresso specific code
Merge pull request #2 from Disruption/disruption/feature/espresso_backend_update

Replaced all robotium solo usages by espresso specific code
PUAB: Default to enter when the edittext is multiline
Fix NPE when optaining root views
Merge pull request #502 from calabash/press-user-action-button-enter

PUAB: Default to enter when the edittext is multiline
Merge branch 'master' of github.com:calabash/calabash-android

Conflicts:
	ruby-gem/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/text/PressUserActionButton.java