Merge branch 'develop' into feature/issue-336-morning-beep
Fix NullPointerException
Test reactivating custom sound
Make SettingsActivity constants public
Honour preferences for sound!
Merge branch 'develop' into feature/issue-336-morning-beep
Merge pull request #350 from daydreaming-experiment/feature/issue-336-morning-beep

Feature/issue 336 morning beep