Merge branch 'devel' of github.com:pressgang-ccms/DocBuilder2 into devel

Conflicts:
	.idea/workspace.xml