Merge pull request #35 from undp/devseed-merge

Devseed merge
removing baseurl
adding back cname, edit media folder link