Merge remote-tracking branch 'origin/beta' into beta

# Conflicts:
#	app/src/main/res/values/strings.xml