Added more functionality to the notification
Fixed merge conflict for PomodoroFragment
Fixed an error with the getters of GPSAlarms
Merge branch 'dev' of github.com:simonjrp/ESCAPE into dev
Merge branch 'dev' into edit