Merge dev to gh-pages
Merge branch development
Table and timer formatting
Merge formatting changes