changes in watermarks managment

CL: If a watermark is larger than the image, it is adapted to the image size
CL: By control panel, the position of the watermarks is set
CL: to one of the 5 positions
CL: This position is applied for every watermarks (even image specific watermark,
CL: or folder watermark, or global watermark)