moving watermark into mediamanager

Now the watermark.png has to be stored in :watermark.png or
:wiki:watermark.png
Files that are named watermark.png are excluded from watermarking, so
that they can be uploaded by the mediamanger.
Release date updated
Merge pull request #1 from lazyzero/master

pull upstream