Merge English and Japanese glossaries into one#88

xfq merged 3 commits intogh-pagesw3c/jlreq:gh-pagesfrom

xfq/merge-glossaryw3c/jlreq:xfq/merge-glossaryCopy head branch name to clipboard