sized watermark implementation
add size info to analyzer
Merge branch 'master' into different-wm-sizes

Conflicts:
	src/watermarker/core/watermark.py
fix and test sizing
Merge pull request #12 from vladozc/different-wm-sizes

Different wm sizes