Animate photo countdown
code cleanup
Merge branch 'master-egbert'