Merge pull request #185 from ims21/master

added play button in size 20x20
Adjust to changes in TimerEntry
rebuild TimerSanityConflict screen into meaningful status