fixed watermark issues and equation autofill issues
Merge branch 'Dev-Dave' of https://github.com/GabeTesta/Warps into Dev-Dave