Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment
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 pull request #601 from will-moore/web_plugin_update_11806_dev_4_4

update plugin options. See #11806 dev_4_4
Small fixes from PR #603
Linking to Django 1.3 specifically
Merge pull request #602 from hflynn/django_link

Replace old version Django docs link
Merge pull request #603 from will-moore/web_app_docs_11730_dev_4_4

Doc running App from anywhere & CreateApp refactor dev_4_4
Merge pull request #604 from sbesson/server_upgrade_bugfix

Server upgrade bugfix