Merge remote-tracking branch 'refs/remotes/origin/master' into Flexible-UI

Conflicts:
	GQ_Android/AndroidManifest.radioranzen.xml
Merge branch 'refs/heads/Flexible-UI'

Conflicts:
	GQ_Android/AndroidManifest.radioranzen.xml