Data source timers
Merge branch 'master' of https://github.com/etinlb/TiledPlatformer