warning dialog if you unlock when a timer is running
improvements on animations
Merge remote-tracking branch 'origin/master'