Increased join timeout to 30 seconds.
Refresh menu item is back, but with 3 hints to pulltorefresh.
version 1.5.1, version code 17.
Merge remote-tracking branch 'upstream/master' into feature/actions

Conflicts:
	res/values-de/strings.xml
	res/values/attrs.xml
	res/values/themes.xml