redemption screen
redemption screen timer
Merge remote-tracking branch 'origin/master'
little fixes, my events and merging