image fixes and watermark
Merge branch 'master' of https://github.com/Kartessian/MVC