Image upload urls add baseurl and media directory (if set)
Merge pull request #779 from jpeg729/imageurls

Image upload urls add baseurl and media directory (if set)