update from server@eng.local
Merge branch 'eng.local' into eng
update watermark.png
activate watermark
rewrite watermark.php
Merge branch 'eng.local' into eng