[db] saved state
Merge remote-tracking branch 'origin/dev' into dan-dev
Merge remote-tracking branch 'origin/dev' into dan-dev

Conflicts:
	project.properties
Merge remote-tracking branch 'origin/dev' into dan-dev
[db] cleans up the duration selector
[db] moves to relative duration dialog
[db] finally - duration picker is stable the way I want it to be
[db] change number of minutes from 60 to 59
[db] values are read in and out of the duration chooser
[db] Updates main config display
[db] leftovers
Merge remote-tracking branch 'origin/dev' into dan-dev