Working on Bugzilla searching in PressZilla
Merge branch 'master' of github.com:pressgang-ccms/DocBuilder2

Conflicts:
	.idea/workspace.xml