Add watermark plugin and fix ticket #929
Modify watermark text