updating documentation to use new glosary

As a follow up of https://github.com/openmicroscopy/openmicroscopy/pull/3020#issuecomment-55398118 there is an update of the OMERO.web doc
http://ci.openmicroscopy.org/job/OMERO-5.0-merge-docs/? has been modified to track the `develop/merge/autogen` branch by default. Note this may have implications in terms of the merging /cc @hflynn