tables template divided into small pieces
notes added
Merge branch 'master' into gh-pages