Update docker-development.rst
Update docker-development.rst
Update docker-development.rst
Switch to plugins to handle specifying available markings.
Merge branch 'marking-plugins' into angular-model

Conflicts:
	web-server/config.ini