Remove watermark options from modules settings
Adding watermark checkbox
Merge origin/master