APD-605: Glossary page words linked to other words without string-match
APD-605: Formatted code
APD-605: removed contextpath in anchor href
Merge branch 'APD-605' into develop