Added tooltips and a template functionality for instructional use
Two more hanzi
Merge branch 'develop' into gh-pages