added title attribute
added title to link updated link
manual merge of index file

chose the one from gh-pages branch
updated word glossary file
updated word glossary file
resolve conflict on the doc file