update plugin options. See #11806
Replace old version Django docs link
Merge pull request #599 from pwalczysko/rebase_dev_4_4

Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment
Doc running App from anywhere & CreateApp refactor

Conflicts:

	omero/developers/Web/CreateApp.txt

Conflicts:

	omero/developers/Web/CreateApp.txt
Add app settings to docs from PR #1788
Add warning for import changes in upgraded Apps
Removing Django 1.6-releated comments from previous commits
Fix OMERO.server directory in server upgrade section

- Fix OMERO.server directory name (removing undesired .zip)
- Add recommended symlinking to simplify subsequent steps with
  $ cd OMERO.server
Use :file: markup for configuration directory/file
merge dev_4_4 -D org -I include -E exclude: PR 595 (Web config docs 11723 11724 (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 601 (update plugin options. See #11806 dev_4_4)
merge dev_4_4 -D org -I include -E exclude: PR 602 (Replace old version Django docs link)
merge dev_4_4 -D org -I include -E exclude: PR 603 (Doc running App from anywhere & CreateApp refactor dev_4_4)
merge dev_4_4 -D org -I include -E exclude: PR 604 (Server upgrade bugfix)