comment block with 4 watermarks
Merge branch 'js' into php
set watermark defaults to 0, 0
Merge branch 'js' into php
experiment on download.php, commented js