Fixing messages
Merge branch 'master' into gh-pages

Conflicts:
	js/table-heading.js
Merge branch 'gh-pages' of github.com:alexkalderimis/show-list-tool into gh-pages