Fix timer edit view constraints after merge (osx)
Start/stop button colors (osx)
Fixed cut off AM PM text in Time entry edit view
Merge branch 'master' into builds
7.279