Merge branch 'refs/heads/develop'
Fix desktop notification settings to allow alerts to appear
Update Notifier to clear old notifications before posting on top
Merge branch 'refs/heads/master' into develop