rewrite watermark.php
Merge branch 'master2' into newtinymce