Added Glossary section
Merge branch 'develop'