Merge pull request #1051 from hflynn/rebased/dev_5_0/faq-stuff

Faq stuff (rebased onto dev_5_0)
merge dev_5_0 -Dorg -Ssuccess-only: PR 1043 (adding logout to the filter)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 6dd7ecb..3b3c193
Previously merged:
  # PR 1051 hflynn 'Faq stuff (rebased onto dev_5_0)'
  # PR 1050 snoopycrimecop 'Update auto-generated properties'
  # PR 1036 hflynn 'changing help link for editor'
  # PR 1035 hflynn 'Adding link to import scenarios to cli import doc (rebased onto dev_5_0)'
  # PR 1033 hflynn 'Fixing use of :option: for new sphinx (dev_5_0)'
  # PR 1029 aleksandra-tarkowska 'csrf protection'
  # PR 1030 hflynn 'Updating build no. for linux walkthrough'
  # PR 1028 snoopycrimecop 'Update auto-generated properties'
  # PR 1026 hflynn 'Adding note about openjdk8 not being supported'

Merged PRs:
  # PR 1043 aleksandra-tarkowska 'adding logout to the filter'

Generated by OME-5.0-merge-push#279 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/279/)