Change the way URLs are loaded to include inner urls from twitter emails.  Also added intent for www. links.

Correct the way we tell users of a URL parse failure and give option to re-load in another app.
Change to beta 5
Merge branch 'Upstream_release' into Upstream_develop

Conflicts:
	android/clientbeta/AndroidManifest.xml
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'Upstream/release' into Upstream_master
Merge branch 'Upstream_master' into Upstream_release
Merge branch 'Upstream_release' into Upstream_develop
Merge remote-tracking branch 'upstream/develop' into develop