Fixed bug with towers timer
Last fixes and cleaning up
Merge branch 'master' into gh-pages