Merge branch 'release/2.7' into develop
Merge branch 'hotfix/quiet_hours' into develop
bump version for beta group
Add ability to filter notification text across all applications or just individual applications
Merge branch 'hotfix/translation_dialog_fix' into develop
Add empty conversions string to strings.xml
Merge branch 'hotfix/translation_fixes'
Merge branch 'hotfix/translation_fixes' into develop

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
Yet another translation fix
Version bump
Merge branch 'release/2.8'