Merge pull request #23 from qidane/error-page-redirect

Adding a custom error page
Change Resources page to Training Course Material page
merge master -Dorg -Isnoopycrimecop/ome-help:cname_staging -Snone: PR 25 (Change Resources page to Training Course Material page)
merge master -Dorg -Isnoopycrimecop/ome-help:cname_staging -Snone: branch snoopycrimecop:cname_staging
merge master -Dorg -Isnoopycrimecop/ome-help:cname_staging -Snone

Repository: openmicroscopy/ome-help
Already up-to-date.

Merged PRs:
  # PR 25 gusferguson 'Change Resources page to Training Course Material page'
Merged branches:
  # snoopycrimecop:cname_staging

Generated by OME-help-staging#27 (http://ci.openmicroscopy.org/job/OME-help-staging/27/)