added lines, text labels and tick marks
added mesh drawing back
Merge branch 'master' into gh-pages
rebuilt