Hide start/stop time box when not storing start/stop (osx)
More merging of timer edit and view (osx)
Fixed cut off AM PM text in Time entry edit view
Merge branch 'master' into builds
7.278