Removed countdown, as it was up
Merge branch 'development'