Merge branch 'jerome-1322' into prod
Merge pull request #24 from ludmilamarian/jerome-1322

Conflicts:
	modules/websearch/lib/websearch_templates.py
Merge pull request #25 from kasioumis/master-to-maint-1.1-WebSubmit-file-stamper-option-to-copy-metadata

WebSubmit: file stamper option to copy metadata
Merge pull request #27 from pglauner/master-faster-weblinkback

Master faster weblinkback