Add watermark
Merge branch 'watermark' into stage

Conflicts:
	src/test/java/org/atlasapi/feeds/utils/DescriptionWatermarkerTest.java