Updated the UI to use Watermarks, generator fixes
Merge branch 'master' of https://github.com/patware/GenerateText